[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6729] Merge 6723:6728 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6729] Merge 6723:6728 from trunk |
|
Date: |
Tue, 04 Jan 2011 13:26:06 +0000 |
Revision: 6729
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6729
Author: sigurdne
Date: 2011-01-04 13:26:06 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Merge 6723:6728 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.soapplication.inc.php
branches/Version-1_0-branch/booking/setup/phpgw_no.lang
branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/property/inc/class.boalarm.inc.php
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.soalarm.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.uialarm.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/config.tpl
branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
branches/Version-1_0-branch/sms/bin/default/set_workorder_status.php
branches/Version-1_0-branch/sms/inc/plugin/gateway/carrot/send.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728
Modified: branches/Version-1_0-branch/booking/inc/class.soapplication.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.soapplication.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/booking/inc/class.soapplication.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -98,6 +98,9 @@
$errors['from_'] = lang('Invalid from
date');
}
}
+ if(strlen($entity['contact_name']) > 50) {
+ $errors['contact_name'] = lang('Contact information name is to
long. max 50 characters');
+ }
}
function get_building_info($id)
Modified: branches/Version-1_0-branch/booking/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-01-04
13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/booking/setup/phpgw_no.lang 2011-01-04
13:26:06 UTC (rev 6729)
@@ -486,3 +486,4 @@
Can not repeat from a date in the past booking no Du kan ikke repetere
fra en dato i fortiden.
Can not create a booking in the past booking no Du kan ikke opprette en
booking i fortiden.
Allocations with existing allocations or bookings (%1) booking no
Tildeinger med eksisterende tildelinger eller bookinger (%1)
+Contact information name is to long. max 50 characters booking no Navn i
kontakt informasjon er for langt. Maks 50 tegn
Modified: branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/bookingfrontend/setup/phpgw_no.lang
2011-01-04 13:26:06 UTC (rev 6729)
@@ -322,3 +322,4 @@
Lengt of shortname is to long, max 11 characters long bookingfrontend no
Kortnavn er for langt, maks 11 tegn
Go back to calendar bookingfrontend no Tilbake til kalender
Agegroups kan not be larger than 9999 peoples bookingfrontend no
Estimert antall deltakere kan ikke være større en 9999 personer
+Contact information name is to long. max 50 characters bookingfrontend no
Navn i kontakt informasjon er for langt. Maks 50 tegn
Modified: branches/Version-1_0-branch/property/inc/class.boalarm.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boalarm.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.boalarm.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -245,7 +245,7 @@
{
if(!$method)
{
- $method = 'property' .'.boalarm.send_alarm';
+ $method = 'property.boalarm.send_alarm';
}
// echo "<p>save_alarm(event_id=$event_id, alarm=";
print_r($alarm); echo ")</p>\n";
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -1230,6 +1230,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
}
/*
@@ -1270,6 +1271,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
for ($i=2;$i<($type_id+1);$i++)
{
@@ -1283,7 +1285,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
-
+ $uicols['sortable'][] = '';
}
}
@@ -1300,6 +1302,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
}
if($uicol_address)
@@ -1313,6 +1316,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
}
$config_count = count($config);
@@ -1335,6 +1339,7 @@
$uicols['datatype'][]
= '';
$uicols['formatter'][]
= '';
$uicols['classname'][]
= '';
+ $uicols['sortable'][]
= true;
$cols_return[]
= 'street_number';
$uicols['input_type'][]
= 'hidden';
@@ -1346,8 +1351,8 @@
$uicols['datatype'][]
= '';
$uicols['formatter'][]
= '';
$uicols['classname'][]
= '';
+ $uicols['sortable'][]
= '';
-
$cols_return[]
= $config[$i]['column_name'];
$uicols['input_type'][]
= 'hidden';
$uicols['name'][]
= $config[$i]['column_name'];
@@ -1358,6 +1363,7 @@
$uicols['datatype'][]
= '';
$uicols['formatter'][]
= '';
$uicols['classname'][]
= '';
+ $uicols['sortable'][]
= '';
if($lookup)
{
@@ -1379,6 +1385,7 @@
$uicols['datatype'][]
= '';
$uicols['formatter'][]
= '';
$uicols['classname'][]
= '';
+ $uicols['sortable'][]
= '';
if($lookup)
{
@@ -1595,15 +1602,15 @@
switch ($export_format)
{
- case 'csv':
- $this->csv_out($list,$name,$descr,$input_type);
- break;
- case 'excel':
-
$this->excel_out($list,$name,$descr,$input_type);
- break;
- case 'ods':
- $this->ods_out($list,$name,$descr,$input_type);
- break;
+ case 'csv':
+
$this->csv_out($list,$name,$descr,$input_type);
+ break;
+ case 'excel':
+
$this->excel_out($list,$name,$descr,$input_type);
+ break;
+ case 'ods':
+
$this->ods_out($list,$name,$descr,$input_type);
+ break;
}
}
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -116,37 +116,59 @@
$this->criteria_id =
isset($data['criteria_id'])?$data['criteria_id']:'';
}
- function column_list($selected =
array(),$type_id='',$allrows='')
+ function column_list($selected = array())
{
if(!$selected)
{
$selected =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'])
? $GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns']
: '';
}
- $filter = array('list' => ''); // translates to "list
IS NULL"
+ $columns = $this->get_column_list();
+ return
$this->bocommon->select_multi_list($selected,$columns);
+ }
+
+ function get_column_list()
+ {
$columns = array();
- $columns[] = array
+ $columns['planned_cost'] = array
(
- 'id' => 'entry_date',
- 'name'=> lang('entry date')
+ 'id' => 'planned_cost',
+ 'name' => lang('planned cost'),
+ 'sortable' => false,
+ 'formatter' => 'myFormatCount2',
+ 'classname' => 'rightClasss'
);
- $columns[] = array
+ $columns['ecodimb'] = array
(
- 'id' => 'start_date',
- 'name'=> lang('start date')
+ 'id' => 'ecodimb',
+ 'name' => lang('accounting dim
b'),
+ 'sortable' => true
);
- $columns[] = array
+ $columns['entry_date'] = array
(
- 'id' => 'end_date',
- 'name'=> lang('end date')
+ 'id' => 'entry_date',
+ 'name' => lang('entry date'),
+ 'sortable' => true
);
- $columns[] = array
+ $columns['start_date'] = array
(
- 'id' => 'billable_hours',
- 'name'=> lang('billable hours')
+ 'id' => 'start_date',
+ 'name' => lang('start date'),
+ 'sortable' => true
);
+ $columns['end_date'] = array
+ (
+ 'id' => 'end_date',
+ 'name' => lang('end date'),
+ 'sortable' => true
+ );
+ $columns['billable_hours'] = array
+ (
+ 'id' => 'billable_hours',
+ 'name' => lang('billable
hours'),
+ 'sortable' => true
+ );
-
$column_list=$this->bocommon->select_multi_list($selected,$columns);
- return $column_list;
+ return $columns;
}
function select_status_list($format='',$selected='')
@@ -240,6 +262,11 @@
'id' => '6',
'name' => lang('module')
),
+ array
+ (
+ 'id' => '7',
+ 'name' => lang('accounting dim
b')
+ )
);
return
$this->bocommon->select_list($selected,$criteria);
}
@@ -296,6 +323,14 @@
'front' => "'",
'back' => "'"
);
+ $criteria[7] = array
+ (
+ 'field' => 'fm_project.ecodimb',
+ 'type' => 'int',
+ 'matchtype' => 'exact',
+ 'front' => '',
+ 'back' => ''
+ );
if($id)
{
@@ -331,16 +366,20 @@
$this->uicols = $this->so->uicols;
$custom_cols =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'] :
array();
+ $column_list = $this->get_column_list();
- foreach ($custom_cols as $col)
+ foreach ($custom_cols as $col_id)
{
$this->uicols['input_type'][] = 'text';
- $this->uicols['name'][] = $col;
- $this->uicols['descr'][] =
lang(str_replace('_', ' ', $col));
- $this->uicols['statustext'][] = $col;
+ $this->uicols['name'][] =
$col_id;
+ $this->uicols['descr'][] =
$column_list[$col_id]['name'];
+ $this->uicols['statustext'][] =
$column_list[$col_id]['name'];
$this->uicols['exchange'][] = false;
$this->uicols['align'][] = '';
$this->uicols['datatype'][] = false;
+ $this->uicols['sortable'][] =
$column_list[$col_id]['sortable'];
+ $this->uicols['formatter'][] =
$column_list[$col_id]['formatter'];
+ $this->uicols['classname'][] =
$column_list[$col_id]['classname'];
}
if(!isset($data['skip_origin']) ||
!$data['skip_origin'])
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -234,7 +234,7 @@
'H' => lang('Billing hours'),
'F' => lang('finnish date'),
'SC' => lang('Status changed'),
- 'M' => lang('Sendt by email to'),
+ 'M' => lang('Sent by email to'),
'AC'=> lang('actual cost changed'),
);
@@ -579,14 +579,14 @@
case 'L': $type = lang('Location changed');
break;
case 'AC': $type = lang('actual cost changed');
break;
case 'M':
- $type = lang('Sendt by email to');
+ $type = lang('Sent by email to');
$this->order_sent_adress =
$value['new_value']; // in case we want to resend the order as an reminder
break;
default:
// nothing
}
- // if ( $value['status'] == 'X' ||
$value['status'] == 'R' || (strlen($value['status']) == 2 &&
substr($value['new_value'], 0, 1) == 'C') ) // if custom status
+ // if ( $value['status'] == 'X' ||
$value['status'] == 'R' || (strlen($value['status']) == 2 &&
substr($value['new_value'], 0, 1) == 'C') ) // if custom status
if ( $value['status'] == 'X' ||
$value['status'] == 'R' || preg_match('/^C/i', $value['status']) || (
$value['status'] == 'R' && preg_match('/^C/i', $value['new_value']))) // if
custom status
{
switch ($value['status'])
Modified: branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.boworkorder.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -167,39 +167,49 @@
}
}
- function column_list($selected =
array(),$type_id='',$allrows='')
+ function column_list($selected = array())
{
if(!$selected)
{
$selected =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns'])
?
$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns']
: '';
}
- $filter = array('list' => ''); // translates to "list
IS NULL"
+
+ $columns = $this->get_column_list();
+ return
$this->bocommon->select_multi_list($selected,$columns);
+ }
+
+ function get_column_list()
+ {
$columns = array();
-
- $columns[] = array
+ $columns['ecodimb'] = array
(
+ 'id' => 'ecodimb',
+ 'name' => lang('accounting dim
b'),
+ 'sortable' => true
+ );
+ $columns['entry_date'] = array
+ (
'id' => 'entry_date',
'name'=> lang('entry date')
);
- $columns[] = array
+ $columns['start_date'] = array
(
'id' => 'start_date',
'name'=> lang('start date')
);
- $columns[] = array
+ $columns['end_date'] = array
(
'id' => 'end_date',
'name'=> lang('end date')
);
- $columns[] = array
+ $columns['billable_hours'] = array
(
'id' => 'billable_hours',
'name'=> lang('billable hours')
);
-
$column_list=$this->bocommon->select_multi_list($selected,$columns);
- return $column_list;
+ return $columns;
}
function next_id()
@@ -305,6 +315,11 @@
'id' => '8',
'name' => lang('vendor id')
),
+ array
+ (
+ 'id' => '9',
+ 'name' => lang('accounting dim
b')
+ )
);
return
$this->bocommon->select_list($selected,$criteria);
}
@@ -377,6 +392,14 @@
'front' => '',
'back' => ''
);
+ $criteria[9] = array
+ (
+ 'field' => 'fm_workorder.ecodimb',
+ 'type' => 'int',
+ 'matchtype' => 'exact',
+ 'front' => '',
+ 'back' => ''
+ );
if($id)
{
@@ -409,14 +432,20 @@
$this->uicols = $this->so->uicols;
$custom_cols =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns']
?
$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns']
: array();
- foreach ($custom_cols as $col)
+ $column_list = $this->get_column_list();
+
+ foreach ($custom_cols as $col_id)
{
$this->uicols['input_type'][] = 'text';
- $this->uicols['name'][] = $col;
- $this->uicols['descr'][] =
lang(str_replace('_', ' ', $col));
- $this->uicols['statustext'][] = $col;
+ $this->uicols['name'][] =
$col_id;
+ $this->uicols['descr'][] =
$column_list[$col_id]['name'];
+ $this->uicols['statustext'][] =
$column_list[$col_id]['name'];
+ $this->uicols['exchange'][] = false;
+ $this->uicols['align'][] = '';
+ $this->uicols['datatype'][] = false;
+ $this->uicols['sortable'][] =
$column_list[$col_id]['sortable'];
}
- //_debug_array($this->uicols);die();
+
foreach ($workorder as &$entry)
{
$entry['entry_date'] =
$GLOBALS['phpgw']->common->show_date($entry['entry_date'],$dateformat);
@@ -548,11 +577,14 @@
case 'A': $type = lang('Re-assigned'); break;
case 'P': $type = lang('Priority changed');
break;
case 'M':
- $type = lang('Sendt by email to');
+ $type = lang('Sent by email to');
$_order_sent_adress = explode('
',$value['new_value']);
$this->order_sent_adress =
$_order_sent_adress[0]; // in case we want to resend the order as an reminder
unset($_order_sent_adress);
break;
+ case 'MS':
+ $type = lang('Sent by sms');
+ break;
case 'B': $type = lang('Budget changed'); break;
case 'CO': $type = lang('Initial Coordinator');
break;
case 'C': $type = lang('Coordinator changed');
break;
Modified: branches/Version-1_0-branch/property/inc/class.soalarm.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soalarm.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.soalarm.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -77,32 +77,35 @@
function read($data)
{
- if(is_array($data))
+ $id = isset($data['id']) &&
$data['id'] ? $data['id'] : 0;
+ $start = isset($data['start']) &&
$data['start'] ? $data['start'] : 0;
+ $filter = isset($data['filter']) ?
$data['filter'] : '';
+ $query = isset($data['query']) ?
$data['query'] : '';
+ $sort = isset($data['sort']) && $data['sort']
? $data['sort'] : 'DESC';
+ $order = isset($data['order']) ?
$data['order'] : '';
+ $allrows = isset($data['allrows']) ?
$data['allrows'] : '';
+
+ if($order == 'undefined')
{
- $id = (isset($data['id'])?$data['id']:0);
- $start =
(isset($data['start'])?$data['start']:0);
- $filter =
(isset($data['filter'])?$data['filter']:'');
- $query =
(isset($data['query'])?$data['query']:'');
- $sort =
(isset($data['sort'])?$data['sort']:'DESC');
- $order =
(isset($data['order'])?$data['order']:'');
- $allrows =
(isset($data['allrows'])?$data['allrows']:'');
+ $order = '';
}
if ($order)
{
- $ordermethod = " order by $order $sort";
+ $ordermethod .= " ORDER BY $order $sort";
}
else
{
- $ordermethod = ' order by id DESC';
+ $ordermethod = ' ORDER BY id DESC';
}
$where = 'WHERE';
+
+ $filtermethod = '';
if ($filter > 0)
{
- $filtermethod .= " $where owner='$filter' ";
+ $filtermethod .= " $where owner='{$filter}' ";
$where = 'AND';
-
}
$id = $this->db->db_addslashes($id);
@@ -110,7 +113,7 @@
{
$filtermethod = "$where id $this->like '%$id%'
AND id!='##last-check-run##'";
}
- elseif (!$id)
+ else if (!$id)
{
$filtermethod = $where . ' next<='.time()." AND
id!='##last-check-run##'";
}
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -137,6 +137,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
$cols .= ", project_group";
$cols_return[] =
'project_group';
@@ -149,6 +150,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = '';
$cols .= ", fm_project_status.descr as status";
$cols_return[] =
'status';
@@ -161,6 +163,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
$cols.= ",$entity_table.entry_date";
$cols_return[] =
'entry_date';
@@ -168,6 +171,9 @@
$cols_return[] =
'start_date';
$cols.= ",$entity_table.end_date";
$cols_return[] =
'end_date';
+ $cols.= ",$entity_table.ecodimb";
+ $cols_return[] =
'ecodimb';
+
/*
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'entry_date';
@@ -178,6 +184,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
*/
$cols.= ",$entity_table.name as name";
$cols_return[] =
'name';
@@ -190,6 +197,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols.= ",loc1_name";
$cols_return[] =
'loc1_name';
@@ -202,6 +210,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols.= ",account_lid as coordinator";
$cols_return[] =
'coordinator';
@@ -214,6 +223,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols.= ",(fm_project.budget +
fm_project.reserve) as budget";
$cols_return[] =
'budget';
@@ -226,6 +236,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = '';
$cols .= ',sum(fm_workorder.combined_cost) as
combined_cost';
$cols_return[] = 'combined_cost';
@@ -238,6 +249,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = '';
$cols .= ',(sum(fm_workorder.act_mtrl_cost) +
sum(fm_workorder.act_vendor_cost)) as actual_cost';
$cols_return[] = 'actual_cost';
@@ -250,9 +262,11 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = '';
$cols .= ',planned_cost';
$cols_return[] = 'planned_cost';
+/*
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'planned_cost';
$uicols['descr'][] =
lang('planned cost');
@@ -262,7 +276,8 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
-
+ $uicols['sortable'][] = '';
+*/
$cols.= ",$entity_table.user_id";
$cols .= ',sum(fm_workorder.billable_hours) as
billable_hours';
@@ -375,7 +390,7 @@
}
$group_method = ' GROUP BY
fm_project_status.descr,loc1_name,fm_project.location_code,fm_project.id,fm_project.entry_date,fm_project.start_date,fm_project.end_date,'
- .
'fm_project.name,phpgw_accounts.account_lid,fm_project.user_id,fm_project.address,'
+ .
'fm_project.name,fm_project.ecodimb,phpgw_accounts.account_lid,fm_project.user_id,fm_project.address,'
.
'fm_project.budget,fm_project.reserve,planned_cost,project_group';
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -157,6 +157,7 @@
$uicols['statustext'][] = lang('Project
ID');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
$cols .= ",fm_workorder.id as workorder_id";
$cols_return[] =
'workorder_id';
@@ -166,6 +167,7 @@
$uicols['statustext'][] =
lang('Workorder ID');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
$cols .= ",fm_workorder.title as title";
$cols_return[] =
'title';
@@ -175,6 +177,7 @@
$uicols['statustext'][] =
lang('Workorder title');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols .= ",fm_workorder_status.descr as status";
$cols_return[] =
'status';
@@ -184,6 +187,7 @@
$uicols['statustext'][] =
lang('Workorder status');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols .= ",fm_workorder.entry_date as
entry_date";
$cols_return[] =
'entry_date';
@@ -191,6 +195,9 @@
$cols_return[] =
'start_date';
$cols .= ",fm_workorder.end_date as end_date";
$cols_return[] =
'end_date';
+ $cols.= ",fm_workorder.ecodimb";
+ $cols_return[] =
'ecodimb';
+
/*
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'entry_date';
@@ -207,6 +214,7 @@
$uicols['statustext'][] =
lang('Workorder User');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols .= ',fm_workorder.vendor_id';
$cols_return[] = 'vendor_id';
@@ -216,6 +224,7 @@
$uicols['statustext'][] = lang('Vendor
ID');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols.= ",loc1_name";
$cols_return[] =
'loc1_name';
@@ -225,8 +234,8 @@
$uicols['statustext'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
-
$cols .= ",fm_project.user_id as project_owner";
$joinmethod .= " $this->join fm_workorder ON
($entity_table.id = fm_workorder.project_id) $this->join phpgw_accounts ON
(fm_workorder.user_id = phpgw_accounts.account_id))";
@@ -243,6 +252,7 @@
$uicols['statustext'][] = lang('Vendor
name');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols .= ',fm_workorder.combined_cost';
$cols_return[] = 'combined_cost';
@@ -252,6 +262,7 @@
$uicols['statustext'][] = lang('Cost -
either budget or calculation');
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = true;
$cols .= ',fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost as actual_cost';
$cols_return[] = 'actual_cost';
@@ -261,6 +272,7 @@
$uicols['statustext'][] = lang('Actual
cost - paid so far');
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = true;
$joinmethod .= " $this->left_join fm_vendor ON
(fm_workorder.vendor_id = fm_vendor.id))";
$paranthesis .='(';
@@ -307,6 +319,9 @@
$uicols['exchange'][] = false;
$uicols['align'][]
= '';
$uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
}
else
{
Modified: branches/Version-1_0-branch/property/inc/class.uialarm.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uialarm.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.uialarm.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -64,7 +64,7 @@
$this->start = $this->bo->start;
$this->query = $this->bo->query;
- $this->sort = $this->bo->sort;
+ $this->sort = $this->bo->sort;
$this->order = $this->bo->order;
$this->filter = $this->bo->filter;
$this->method_id = $this->bo->method_id;
@@ -230,28 +230,6 @@
foreach ($list as $alarm)
{
- $times = '';
- $data = '';
-
- if(is_array($alarm['times']))
- {
- foreach ($alarm['times'] as $key =>
$value)
- {
- $times .= "{$key} => {$value} ";
- }
- }
- else
- {
- $times =
$GLOBALS['phpgw']->common->show_date($alarm['times']);
- }
- if(is_array($alarm['data']))
- {
- foreach ($alarm['data']as $key =>
$value)
- {
- $data .= "{$key} => {$value} ";
- }
- }
-
$link_edit = '';
$lang_edit_statustext = '';
$text_edit = '';
@@ -267,15 +245,15 @@
$link_edit
= "-";
}
- $check_box = "<input type=\"checkbox\"
name=\"values[alarm][".$alarm[id]."]\" value=\"".$alarm[id]."\"
class=\"myValuesForPHP\">";
+ $check_box = "<input type=\"checkbox\"
name=\"values[alarm][".$alarm['id']."]\" value=\"".$alarm['id']."\"
class=\"myValuesForPHP\">";
$content[] = array
(
'id'
=> $alarm['id'],
'next_run'
=> $GLOBALS['phpgw']->common->show_date($alarm['next']),
- 'times'
=> $times,
+ 'times'
=> is_array($alarm['times']) ? print_r($alarm['times'],true) :
$GLOBALS['phpgw']->common->show_date($alarm['times']),
'method'
=> $alarm['method'],
- 'data'
=> $data,
+ 'data'
=> print_r($alarm['data'],true),
'enabled'
=> $alarm['enabled'],
'user'
=> $alarm['user'],
'check_box'
=> $check_box,
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -676,7 +676,7 @@
$datatable['headers']['header'][$i]['format'] =
$this->bocommon->translate_datatype_format($uicols['datatype'][$i]);
$datatable['headers']['header'][$i]['sortable'] = false;
- if($uicols['name'][$i]=='project_id' ||
$uicols['name'][$i]=='address' || $uicols['name'][$i]=='project_group')
+ if(isset($uicols['sortable'][$i]) &&
$uicols['sortable'][$i])
{
$datatable['headers']['header'][$i]['sortable'] = true;
$datatable['headers']['header'][$i]['sort_field'] = $uicols['name'][$i];
Modified: branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -1291,7 +1291,7 @@
$sms_data['heading'] = lang('Send the following
SMS-message to %1 to update status for this
order:',$config_sms->config_data['common']['gateway_number']);
$sms_data['message'] = 'status ' .
$workorder_id . ' [' . lang('status code') .']';
- $sms_data['status_code'][0]['name'] = '1 => ' .
lang('closed');
+ $sms_data['status_code'][0]['name'] = '1 => ' .
lang('performed');
$sms_data['status_code'][1]['name'] = '2 => ' .
lang('No access');
$sms_data['status_code'][2]['name'] = '3 => ' .
'I arbeid';
$sms_data['status_code_text'] = lang('status
code');
@@ -1540,6 +1540,22 @@
$receipt['message'][]=array('msg' => $attachment_log);
}
+ if(
phpgw::get_var('notify_client_by_sms', 'bool')
+ &&
isset($this->config->config_data['sms_client_order_notice'])
+ &&
$this->config->config_data['sms_client_order_notice']
+ &&
(isset($project['contact_phone'])
+ && $project['contact_phone']
+ ||
phpgw::get_var('to_sms_phone')))
+ {
+ $to_sms_phone =
phpgw::get_var('to_sms_phone');
+ $to_sms_phone = $to_sms_phone ?
$to_sms_phone : $project['contact_phone'];
+ $project['contact_phone'] =
$to_sms_phone;
+
+ $sms =
CreateObject('sms.sms');
+
$sms->websend2pv($this->account,$to_sms_phone,$this->config->config_data['sms_client_order_notice']);
+
$historylog->add('MS',$workorder_id,$to_sms_phone);
+ }
+
if(
$this->boworkorder->order_sent_adress )
{
$action_params = array
@@ -1657,6 +1673,8 @@
'lang_mail'
=> lang('E-Mail'),
'lang_update_email'
=> lang('Update email'),
'lang_update_email_statustext'
=> lang('Check to update the email-address for this vendor'),
+ 'value_sms_client_order_notice'
=> isset($this->config->config_data['sms_client_order_notice']) ?
$this->config->config_data['sms_client_order_notice'] : '',
+ 'value_sms_phone'
=> $project['contact_phone'],
'lang_to_email_address_statustext'
=> lang('The address to which this order will be sendt'),
'to_email'
=> $to_email,
'email_list'
=> $email_list,
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -681,7 +681,8 @@
$datatable['headers']['header'][$i]['visible'] = true;
$datatable['headers']['header'][$i]['format'] =
$this->bocommon->translate_datatype_format($uicols['datatype'][$i]);
$datatable['headers']['header'][$i]['sortable'] = false;
- if($uicols['name'][$i]=='project_id' ||
$uicols['name'][$i]=='workorder_id' || $uicols['name'][$i]=='address')
+
+ if(isset($uicols['sortable'][$i]) &&
$uicols['sortable'][$i])
{
$datatable['headers']['header'][$i]['sortable'] = true;
$datatable['headers']['header'][$i]['sort_field'] = $uicols['name'][$i];
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-01-04
13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-01-04
13:26:06 UTC (rev 6729)
@@ -957,7 +957,7 @@
list voucher property no list underbilag
list workorder property no List arbeidsordre
location property no Lokalisering
-loc1_name property no Navn
+loc1 name property no Navn
local files property no Lokale filer
location changed property no Lokalisering er endret
location code property no Lokaliserings kode
@@ -1078,6 +1078,7 @@
no workorder budget property no Ingen budsjett
arbeidsordre/bestilling
no workorder bugdet property no Ingen arbeidsordrer er
budsjettert
no year property no Ingen årstall
+notify client by sms property no Varsle kunde via SMS
ns3420 property no NS3420
ns3420 description property no NS3420 beskrivelse
nullable property no Kan være NULL
@@ -1121,6 +1122,7 @@
per agreement property no pr avtale
per cent property no Prosent
percentage addition property no prosentvis tillegg
+performed property no Utført
period property no Periode
permission property no rettighet
permissions property no Rettigheter
@@ -1517,7 +1519,8 @@
send e-mail property no Send epost
send order property no Send ordre
Send pdf as attachment to email property no Send PDF som
vedlegg til epost
-sendt by email to property no send med e-post til
+sent by email to property no sendt med e-post til
+Sent by sms property no sendt med SMS
send the following sms-message to %1 to update status for this order:
property no Send følgende SMS-melding til %1 for å oppdatere status
for denne ordren:
send this order by email property no send denne ordren med
e-post
send workorder property no Send ordre
Modified: branches/Version-1_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/config.tpl
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/templates/base/config.tpl
2011-01-04 13:26:06 UTC (rev 6729)
@@ -26,35 +26,42 @@
<textarea cols="40" rows="4"
name="newsettings[delivery_address]"
wrap="virtual">{value_delivery_address}</textarea>
</td>
</tr>
- <tr class="row_on">
+ <tr class="row_off">
<td>{lang_invoice_address}:</td>
<td>
<textarea cols="40" rows="4"
name="newsettings[invoice_address]"
wrap="virtual">{value_invoice_address}</textarea>
</td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_order_footer_header}:</td>
<td><input name="newsettings[order_footer_header]"
value="{value_order_footer_header}"></td>
</tr>
- <tr class="row_on">
+ <tr class="row_off">
<td>{lang_order_footer}:</td>
<td>
<textarea cols="40" rows="4"
name="newsettings[order_footer]" wrap="virtual">{value_order_footer}</textarea>
</td>
</tr>
- <tr class="row_off">
+ <tr class="row_on">
<td>{lang_order_logo}:</td>
<td><input name="newsettings[order_logo]"
value="{value_order_logo}"></td>
</tr>
- <tr class="row_on">
+ <tr class="row_off">
<td>{lang_order_logo_width}:</td>
<td><input name="newsettings[order_logo_width]"
value="{value_order_logo_width}"></td>
</tr>
+ <tr class="row_on">
+ <td>{lang_SMS_client_order_notice}:</td>
+ <td>
+ <textarea cols="40" rows="4"
name="newsettings[sms_client_order_notice]"
wrap="virtual">{value_sms_client_order_notice}</textarea>
+ </td>
+ </tr>
+
<tr class="row_off">
<td>{lang_needed_for_invoice_approval}:</td>
<td>
Modified: branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2011-01-04 13:26:06 UTC (rev 6729)
@@ -402,11 +402,9 @@
<xsl:value-of select="lang_mail"/>
</td>
<td align="left">
-
<input type="text" name="to_email" value="{to_email}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+
<input type="text" name="to_email" value="{to_email}">
+
<xsl:attribute name="title">
<xsl:value-of
select="lang_to_email_address_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -417,10 +415,8 @@
</td>
<td align="left">
<input type="checkbox" name="update_email" value="true"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
+
<xsl:attribute name="title">
<xsl:value-of
select="lang_update_email_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
</xsl:attribute>
</input>
</td>
@@ -439,6 +435,32 @@
</tr>
<tr>
<td class="th_text" align="left">
+
<xsl:value-of select="php:function('lang', 'notify
client by sms')" />
+
</td>
+
<td align="left">
+
<table>
+
<tr>
+
<td>
+
<input type="checkbox" name="notify_client_by_sms"
value="true">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="value_sms_client_order_notice"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
<td>
+
<input type="text" name="to_sms_phone"
value="{value_sms_phone}">
+
<xsl:attribute name="title">
+
<xsl:value-of
select="value_sms_client_order_notice"/>
+
</xsl:attribute>
+
</input>
+
</td>
+
</tr>
+
</table>
+
</td>
+
</tr>
+
+
<tr>
+
<td class="th_text" align="left">
<xsl:value-of select="php:function('lang', 'show
calculated cost')" />
</td>
<td align="left">
@@ -647,10 +669,8 @@
<br/>
<xsl:choose>
<xsl:when test="ressursnr !=''">
-
<b>
<xsl:text>RessursNr: </xsl:text>
<xsl:value-of select="ressursnr"/>
-
</b>
<br/>
</xsl:when>
</xsl:choose>
Modified: branches/Version-1_0-branch/sms/bin/default/set_workorder_status.php
===================================================================
--- branches/Version-1_0-branch/sms/bin/default/set_workorder_status.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/sms/bin/default/set_workorder_status.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -16,8 +16,9 @@
* @package sms
*/
- $status_code = array(
- 1 => 'closed',
+ $status_code = array
+ (
+ 1 => 'utført',
2 => 'ikke_tilgang',
3 => 'i_arbeid',
);
@@ -29,10 +30,10 @@
$workorder_id = $param[0];
$status = $status_code[$param[1]];
- $this->db->query("SELECT status FROM fm_workorder where
id='$workorder_id'",__LINE__,__FILE__);
+ $this->db->query("SELECT status FROM fm_workorder where
id='{$workorder_id}'",__LINE__,__FILE__);
if($this->db->next_record())
{
- $this->db->query("UPDATE fm_workorder set status =
'$status' WHERE id='$workorder_id'" ,__LINE__,__FILE__);
+ $this->db->query("UPDATE fm_workorder set status =
'{$status}' WHERE id='{$workorder_id}'" ,__LINE__,__FILE__);
$historylog =
CreateObject('property.historylog','workorder');
// temporary - fix this
$historylog->account = 6;
Modified: branches/Version-1_0-branch/sms/inc/plugin/gateway/carrot/send.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/plugin/gateway/carrot/send.php
2011-01-04 13:20:59 UTC (rev 6728)
+++ branches/Version-1_0-branch/sms/inc/plugin/gateway/carrot/send.php
2011-01-04 13:26:06 UTC (rev 6729)
@@ -29,7 +29,7 @@
function
gw_send_sms($mobile_sender,$sms_sender,$sms_to,$sms_msg,$gp_code="",$uid="",$smslog_id="",$flash=false)
{
$result = array();
- $sms_msg = utf8_decode($sms_msg);
+// $sms_msg = utf8_decode($sms_msg);
$sms_to = ltrim($sms_to, '+');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6729] Merge 6723:6728 from trunk,
Sigurd Nes <=