[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9300] Merge 9290:9299 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9300] Merge 9290:9299 from trunk |
|
Date: |
Mon, 07 May 2012 20:01:29 +0000 |
Revision: 9300
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9300
Author: sigurdne
Date: 2012-05-07 20:01:28 +0000 (Mon, 07 May 2012)
Log Message:
-----------
Merge 9290:9299 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.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,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289
+
/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,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
2012-05-07 19:58:07 UTC (rev 9299)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.custom_fields.inc.php
2012-05-07 20:01:28 UTC (rev 9300)
@@ -468,7 +468,7 @@
break;
case 'D':
- $ts =
phpgwapi_datetime::date_to_timestamp($attrib['value']);
+ $ts =
phpgwapi_datetime::date_to_timestamp($attrib['value']) -
phpgwapi_datetime::user_timezone();
$attrib['value'] =
date($this->_dateformat, $ts);
break;
@@ -476,7 +476,7 @@
if($attrib['value']['date'])
{
$date_array =
phpgwapi_datetime::date_array($attrib['value']['date']);
- $ts = mktime
((int)$attrib['value']['hour'], (int)$attrib['value']['min'], 0,
$date_array['month'], $date_array['day'], $date_array['year']);
+ $ts = mktime
((int)$attrib['value']['hour'], (int)$attrib['value']['min'], 0,
$date_array['month'], $date_array['day'], $date_array['year']) -
phpgwapi_datetime::user_timezone();
$attrib['value'] =
date($this->_datetimeformat, $ts);
}
else
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2012-05-07 19:58:07 UTC (rev 9299)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2012-05-07 20:01:28 UTC (rev 9300)
@@ -180,55 +180,87 @@
$this->vendor_id =
isset($data['vendor_id'])?$data['vendor_id']:'';
}
- function column_list($selected =
array(),$type_id='',$allrows='')
+
+ function column_list($selected = array())
{
if(!$selected)
{
$selected =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['ticket_columns'])
? $GLOBALS['phpgw_info']['user']['preferences']['property']['ticket_columns']
: '';
}
- $filter = array('list' => ''); // translates to "list
IS NULL"
+ $_columns = $this->get_columns();
+
$columns = array();
+ foreach($_columns as $id => $column_info)
+ {
+ $columns[] = $column_info;
+ }
+
$column_list=$this->bocommon->select_multi_list($selected,$columns);
+ return $column_list;
+ }
- $columns[] = array
+ public function get_columns()
+ {
+ $columns = array();
+
+ $columns['modified_date'] = array
(
'id' => 'modified_date',
'name' => lang('modified
date'),
// 'sortable' => true
);
- $columns[] = array
+ $columns['status'] = array
(
'id' => 'status',
'name'=> lang('status')
);
- $columns[] = array
+ $columns['address'] = array
(
'id' => 'address',
'name'=> lang('address')
);
- $columns[] = array
+ $columns['user'] = array
(
'id' => 'user',
'name'=> lang('user')
);
- $columns[] = array
+ $columns['assignedto'] = array
(
'id' => 'assignedto',
'name'=> lang('assignedto')
);
- $columns[] = array
+ if( $GLOBALS['phpgw']->acl->check('.ticket.order',
PHPGW_ACL_ADD, 'property') )
+ {
+ $columns['order_id'] = array
+ (
+ 'id' => 'order_id',
+ 'name'=> lang('order id')
+ );
+ $columns['estimate'] = array
+ (
+ 'id' => 'estimate',
+ 'name'=> lang('estimate')
+ );
+ $columns['actual_cost'] = array
+ (
+ 'id' => 'actual_cost',
+ 'name'=> lang('actual cost')
+ );
+ }
+
+ $columns['vendor'] = array
(
'id' => 'vendor',
'name'=> lang('vendor')
);
- $columns[] = array
+ $columns['billable_hours'] = array
(
'id' => 'billable_hours',
'name'=> lang('billable hours')
);
- $columns[] = array
+ $columns['district'] = array
(
'id' => 'district',
'name'=> lang('district')
@@ -238,7 +270,7 @@
foreach($this->uicols_related as $related)
{
- $columns[] = array
+ $columns[$related] = array
(
'id' => $related,
'name'=>
ltrim(lang(str_replace('_', ' ', $related)),'!')
@@ -247,22 +279,35 @@
if( $this->show_finnish_date )
{
- $columns[] = array
+ $columns['finnish_date'] = array
(
'id' => 'finnish_date',
'name'=> lang('finnish_date')
);
- $columns[] = array
+ $columns['delay'] = array
(
'id' => 'delay',
'name'=> lang('delay')
);
}
-
$column_list=$this->bocommon->select_multi_list($selected,$columns);
- return $column_list;
+
+ $custom_cols = $this->custom->find('property',
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
+ foreach ($custom_cols as $custom_col)
+ {
+ $columns[$custom_col['column_name']] = array
+ (
+ 'id' => $custom_col['column_name'],
+ 'name'=> $custom_col['input_text'],
+ 'datatype' => $custom_col['datatype'],
+ );
+ }
+
+ return $columns;
}
+
+
function filter($data=0)
{
if(is_array($data))
Modified: branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
2012-05-07 19:58:07 UTC (rev 9299)
+++ branches/Version-1_0-branch/property/inc/class.custom_fields.inc.php
2012-05-07 20:01:28 UTC (rev 9300)
@@ -51,6 +51,8 @@
public function __construct($appname = null)
{
parent::__construct($appname);
+ $this->_db2 = clone($this->_db);
+ $this->contacts = CreateObject('phpgwapi.contacts');
}
/**
@@ -65,7 +67,6 @@
*/
public function prepare($values, $appname, $location,
$view_only='')
{
- $contacts =
CreateObject('phpgwapi.contacts');
$vendor =
CreateObject('property.sogeneric');
$vendor->get_location_info('vendor',false);
@@ -94,21 +95,28 @@
$attributes['lang_datetitle']
= lang('Select date');
}
- if(isset($attributes['value']) &&
$attributes['value'])
+
+ if($attributes['datatype'] == 'D')
{
- if($attributes['datatype'] ==
'DT')
- {
- $timestamp=
strtotime($attributes['value']);
- $attributes['value'] =
array();
-
$attributes['value']['date'] =
$GLOBALS['phpgw']->common->show_date($timestamp,$dateformat);
-
$attributes['value']['hour'] = date('H', $timestamp);
-
$attributes['value']['min'] = date('i', $timestamp);
$clear_functions[$m]['name'] = "clear_{$attributes['name']}()";
$confirm_msg =
lang('delete') . '?';
$clear_functions[$m]['action'] = <<<JS
if(confirm("{$confirm_msg}"))
{
var
attribute_{$i}_date = document.getElementById('values_attribute_{$i}');
+
attribute_{$i}_date.value = '';
+ }
+JS;
+ $m++;
+ }
+ else if($attributes['datatype'] == 'DT')
+ {
+
$clear_functions[$m]['name'] = "clear_{$attributes['name']}()";
+ $confirm_msg =
lang('delete') . '?';
+
$clear_functions[$m]['action'] = <<<JS
+
if(confirm("{$confirm_msg}"))
+ {
+ var
attribute_{$i}_date = document.getElementById('values_attribute_{$i}');
var
attribute_{$i}_hour = document.getElementById('values_attribute_{$i}_hour');
var
attribute_{$i}_min = document.getElementById('values_attribute_{$i}_min');
attribute_{$i}_date.value = '';
@@ -117,7 +125,18 @@
}
JS;
$m++;
+ }
+ if(isset($attributes['value']) &&
$attributes['value'])
+ {
+ if($attributes['datatype'] ==
'DT')
+ {
+ $timestamp=
strtotime($attributes['value']);
+ $attributes['value'] =
array();
+
$attributes['value']['date'] =
$GLOBALS['phpgw']->common->show_date($timestamp,$dateformat);
+
$attributes['value']['hour'] = date('H', $timestamp +
phpgwapi_datetime::user_timezone());
+
$attributes['value']['min'] = date('i', $timestamp +
phpgwapi_datetime::user_timezone());
+
}
else
{
@@ -130,7 +149,7 @@
{
if($attributes['value'])
{
- $contact_data
=
$contacts->read_single_entry($attributes['value'],array('fn','tel_work','email'));
+ $contact_data
=
$this->contacts->read_single_entry($attributes['value'],array('fn','tel_work','email'));
$attributes['contact_name']
= $contact_data[0]['fn'];
$attributes['contact_email']
= $contact_data[0]['email'];
$attributes['contact_tel']
= $contact_data[0]['tel_work'];
@@ -157,10 +176,10 @@
{
if($attributes['value'])
{
- $contact_data
= $contacts->get_principal_organizations_data($attributes['value']);
+ $contact_data
=
$this->contacts->get_principal_organizations_data($attributes['value']);
$attributes['org_name']
= $contact_data[0]['org_name'];
- $comms =
$contacts->get_comm_contact_data($attributes['value'], $fields_comms='',
$simple=false);
+ $comms =
$this->contacts->get_comm_contact_data($attributes['value'], $fields_comms='',
$simple=false);
$comm_data = array();
if(is_array($comms))
@@ -399,7 +418,7 @@
{
if($entry['datatype'] == 'C' ||
$entry['datatype'] == 'T' || $entry['datatype'] == 'V' || $entry['datatype'] ==
'link')
{
- $entry['value'] =
$this->_db->db_addslashes($entry['value']);
+ $entry['value'] =
$this->_db2->db_addslashes($entry['value']);
}
if($entry['datatype'] == 'pwd'
&& $entry['value'] && $entry['value2'])
@@ -426,9 +445,9 @@
{
if($id)
{
-
$this->_db->query("SELECT {$entry['name']} FROM $table WHERE id =
{$id}",__LINE__,__FILE__);
-
$this->_db->next_record();
- $old_value =
$this->_db->f($entry['name']);
+
$this->_db2->query("SELECT {$entry['name']} FROM $table WHERE id =
{$id}",__LINE__,__FILE__);
+
$this->_db2->next_record();
+ $old_value =
$this->_db2->f($entry['name']);
if($entry['value'] !=
$old_value)
{
$data['history_set'][$entry['attrib_id']] = array
@@ -448,12 +467,96 @@
return $data;
}
- function translate_value($values, $location_id, $location_count
= 0)
+ public function get_translated_value($data, $location_id)
{
+ if(!$data['value'])
+ {
+ return $data['value'];
+ }
+
+ $ret = '';
+
$choice_table = 'phpgw_cust_choice';
$attribute_table = 'phpgw_cust_attribute';
$attribute_filter = " location_id = {$location_id}";
- $contacts = CreateObject('phpgwapi.contacts');
+
+ switch($data['datatype'])
+ {
+ case 'R':
+ case 'LB':
+ if($data['attrib_id'])
+ {
+ $sql="SELECT value FROM
$choice_table WHERE $attribute_filter AND attrib_id=" .(int)$data['attrib_id'].
" AND id=" . (int)$data['value'];
+ $this->_db2->query($sql);
+ $this->_db2->next_record();
+ $ret = $this->_db2->f('value');
+ }
+ break;
+ case 'AB':
+ $contact_data =
$this->contacts->read_single_entry($data['value'],array('fn'));
+ $ret = $contact_data[0]['fn'];
+ break;
+ case 'ABO':
+ $contact_data =
$this->contacts->get_principal_organizations_data($data['value']);
+ $ret = $contact_data[0]['org_name'];
+ break;
+ case 'VENDOR':
+ $sql="SELECT org_name FROM fm_vendor
where id=" . (int)$data['value'];
+ $this->_db2->query($sql);
+ $this->_db2->next_record();
+ $ret = $this->_db2->f('org_name',true);
+ break;
+ case 'CH':
+ $ch = explode(',', trim($data['value'],
','));
+ if (isset($ch) AND is_array($ch))
+ {
+ for ($k=0;$k<count($ch);$k++)
+ {
+ $sql="SELECT value FROM
$choice_table WHERE $attribute_filter AND attrib_id= " .
(int)$data['attrib_id'] . ' AND id = ' . (int)$ch[$k];
+
$this->_db2->query($sql);
+ while
($this->_db2->next_record())
+ {
+
$ch_value[]=$this->_db2->f('value');
+ }
+ }
+ $ret = @implode(",",
$ch_value);
+ unset($ch_value);
+ }
+ break;
+ case 'D':
+ $ret =
$GLOBALS['phpgw']->common->show_date(strtotime($data['value']),
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ break;
+ case 'DT':
+ $ret =
$GLOBALS['phpgw']->common->show_date(strtotime($data['value']));
+ break;
+ case 'timestamp':
+ // $ret =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],$data['value']);
+ $ret =
$GLOBALS['phpgw']->common->show_date($data['value']);
+ break;
+ case 'link':
+ $ret =
phpgw::safe_redirect($data['value']);
+ break;
+ case 'user':
+ $ret =
$GLOBALS['phpgw']->accounts->get($data['value'])->__toString();
+ break;
+ case 'pwd':
+ $ret = lang('yes');
+ break;
+ default:
+ if(is_array($data['value']))
+ {
+ $ret = $data['value'];
+ }
+ else
+ {
+ $ret =
stripslashes($data['value']);
+ }
+ }
+ return $ret;
+ }
+
+ function translate_value($values, $location_id, $location_count
= 0)
+ {
// _debug_array($values);die();
$location = array();
$ret = array();
@@ -467,78 +570,7 @@
$location =
explode('-',$data['value']);
}
- $ret[$j][$field] = '';
- if($data['value'])
- {
- switch($data['datatype'])
- {
- case 'R':
- case 'LB':
-
if($data['attrib_id'])
- {
-
$sql="SELECT value FROM $choice_table WHERE $attribute_filter AND attrib_id="
.(int)$data['attrib_id']. " AND id=" . (int)$data['value'];
-
$this->_db->query($sql);
-
$this->_db->next_record();
-
$ret[$j][$field] = $this->_db->f('value');
- }
- break;
- case 'AB':
- $contact_data
= $contacts->read_single_entry($data['value'],array('fn'));
-
$ret[$j][$field] = $contact_data[0]['fn'];
- break;
- case 'ABO':
- $contact_data
= $contacts->get_principal_organizations_data($data['value']);
-
$ret[$j][$field] = $contact_data[0]['org_name'];
- break;
- case 'VENDOR':
- $sql="SELECT
org_name FROM fm_vendor where id=" . (int)$data['value'];
-
$this->_db->query($sql);
-
$this->_db->next_record();
-
$ret[$j][$field] = $this->_db->f('org_name',true);
- break;
- case 'CH':
- $ch =
explode(',', trim($data['value'], ','));
- if (isset($ch)
AND is_array($ch))
- {
- for
($k=0;$k<count($ch);$k++)
- {
-
$sql="SELECT value FROM $choice_table WHERE $attribute_filter AND attrib_id= "
. (int)$data['attrib_id'] . ' AND id = ' . (int)$ch[$k];
-
$this->_db->query($sql);
-
while ($this->_db->next_record())
-
{
-
$ch_value[]=$this->_db->f('value');
-
}
- }
-
$ret[$j][$field] = @implode(",", $ch_value);
-
unset($ch_value);
- }
- break;
- case 'D':
-
$ret[$j][$field] =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],strtotime($data['value']));
- break;
- case 'timestamp':
-
$ret[$j][$field] =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],$data['value']);
- break;
- case 'link':
-
$ret[$j][$field] = phpgw::safe_redirect($data['value']);
- break;
- case 'user':
-
$ret[$j][$field] =
$GLOBALS['phpgw']->accounts->get($data['value'])->__toString();
- break;
- case 'pwd':
-
$ret[$j][$field] = lang('yes');
- break;
- default:
-
if(is_array($data['value']))
- {
-
$ret[$j][$field] = $data['value'];
- }
- else
- {
-
$ret[$j][$field] = stripslashes($data['value']);
- }
- }
- }
+ $ret[$j][$field] =
$this->get_translated_value($data, $location_id);
if($location)
{
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2012-05-07 19:58:07 UTC (rev 9299)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2012-05-07 20:01:28 UTC (rev 9300)
@@ -439,7 +439,13 @@
.
"fm_tts_tickets.entry_date,fm_tts_tickets.modified_date,fm_tts_tickets.finnish_date,fm_tts_tickets.finnish_date2,fm_tts_tickets.order_id,fm_tts_tickets.vendor_id,fm_tts_tickets.actual_cost,"
.
"fm_tts_tickets.budget,fm_tts_tickets.billable_hours,fm_district.descr as
district,fm_tts_views.id as view,fm_location1.loc1_name {$result_order_field}";
- //fm_tts_tickets.* ,fm_location1.loc1_name,
fm_tts_views.id as view {$result_order_field},fm_district.descr as district
+ $custom_cols = $this->custom->find('property',
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
+
+ foreach ($custom_cols as $custom_col)
+ {
+ $return_fields .=
",fm_tts_tickets.{$custom_col['column_name']}";
+ }
+
$sql = "SELECT DISTINCT {$return_fields} FROM
fm_tts_tickets"
. " {$this->join} fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
. " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
@@ -487,6 +493,8 @@
$this->sum_budget =
$cache_info['sum_budget'];
$this->sum_actual_cost =
$cache_info['sum_actual_cost'];
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
+
$tickets = array();
if(!$dry_run)
{
@@ -508,6 +516,7 @@
unset($_fetch_single);
}
+ $i = 0;
while ($this->db->next_record())
{
$tickets[]= array
@@ -535,6 +544,16 @@
'new_ticket'
=> $this->db->f('view') ? false : true,
'billable_hours'
=> $this->db->f('billable_hours'),
);
+
+ foreach ($custom_cols as $custom_col)
+ {
+ if($custom_value =
$this->db->f($custom_col['column_name'],true))
+ {
+ $custom_value =
$this->custom->get_translated_value(array('value' =>$custom_value, 'attrib_id'
=> $custom_col['attrib_id'], 'datatype' => $custom_col['datatype'] ),
$location_id);
+ }
+
$tickets[$i][$custom_col['column_name']] = $custom_value;
+ }
+ $i ++;
}
}
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-05-07 19:58:07 UTC (rev 9299)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2012-05-07 20:01:28 UTC (rev 9300)
@@ -374,7 +374,7 @@
$data = array
(
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'column_list' =>
$this->bo->column_list($selected , $this->type_id, $allrows=true),
+ 'column_list' =>
$this->bo->column_list($selected),
'function_msg' =>
$function_msg,
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_columns' =>
lang('columns'),
@@ -930,39 +930,16 @@
$uicols['descr'][] = lang('entry date');
$custom_cols =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['ticket_columns'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['ticket_columns']
? $GLOBALS['phpgw_info']['user']['preferences']['property']['ticket_columns'] :
array();
+ $columns = $this->bo->get_columns();
+//_debug_array($custom_cols);die();
foreach ($custom_cols as $col)
{
$uicols['name'][] = $col;
- $uicols['descr'][] =
lang(str_replace('_', ' ', $col));
+ $uicols['descr'][] =
$columns[$col]['name'];
}
- if( $order_read )
- {
- $uicols['name'][] = 'order_id';
- $uicols['descr'][] = lang('order id');
-// $uicols['name'][] = 'vendor';
-// $uicols['descr'][] = lang('vendor');
- }
-
- if( $this->acl->check('.ticket.order', PHPGW_ACL_ADD,
'property') )
- {
- $uicols['name'][] = 'estimate';
- $uicols['descr'][] = lang('estimate');
- $uicols['name'][] = 'actual_cost';
- $uicols['descr'][] = lang('actual cost');
- }
-
-/*
- if( $this->show_finnish_date )
- {
- $uicols['name'][] = 'finnish_date';
- $uicols['descr'][] = lang('finnish date');
- $uicols['name'][] = 'delay';
- $uicols['descr'][] = lang('delay');
- }
-*/
$uicols['name'][] = 'child_date';
$uicols['descr'][] = lang('child date');
$uicols['name'][] = 'link_view';
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-05-07 19:58:07 UTC (rev 9299)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_basware_X205.php
2012-05-07 20:01:28 UTC (rev 9300)
@@ -535,7 +535,7 @@
}
else if (!ctype_digit($_order_id))
{
- $merknad = "bestillingsnummeret er på
feil format: '{$_order_id}'";
+ $merknad = "bestillingsnummeret er på
feil format: {$_order_id}";
$this->receipt['error'][] = array('msg'
=> $merknad);
}
else if (!$order_info['order_exist'])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9300] Merge 9290:9299 from trunk,
Sigurd Nes <=