[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7989] Merge 7983:7988 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7989] Merge 7983:7988 from trunk |
|
Date: |
Wed, 02 Nov 2011 11:33:48 +0000 |
Revision: 7989
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7989
Author: sigurdne
Date: 2011-11-02 11:33:48 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Merge 7983:7988 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
branches/Version-1_0-branch/rental/inc/class.soparty.inc.php
branches/Version-1_0-branch/rental/inc/class.uiparty.inc.php
branches/Version-1_0-branch/rental/inc/plugins/fellesdata/party.edit.php
branches/Version-1_0-branch/rental/setup/phpgw_no.lang
branches/Version-1_0-branch/rental/templates/base/common.php
branches/Version-1_0-branch/rental/templates/base/css/base.css
branches/Version-1_0-branch/rental/templates/base/party.php
branches/Version-1_0-branch/rental/templates/base/party_list_partial.php
branches/Version-1_0-branch/rental/templates/base/sync_party_list_org_id.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
+
/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
Modified: branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2011-11-02 11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/frontend/inc/class.uihelpdesk.inc.php
2011-11-02 11:33:48 UTC (rev 7989)
@@ -537,7 +537,9 @@
$GLOBALS['phpgw']->common->phpgw_exit();
}
- if(isset($values['save']))
+ $cat_id = isset($values['cat_id']) && $values['cat_id']
? $values['cat_id'] : $default_cat;
+
+ if(isset($values['save']))
{
foreach($values as $key => $value)
{
@@ -558,11 +560,11 @@
$i++;
}
- $assignedto =
execMethod('property.boresponsible.get_responsible', array('location' =>
$location, 'cat_id' => $default_cat));
+ $assignedto =
execMethod('property.boresponsible.get_responsible', array('location' =>
$location, 'cat_id' => $cat_id));
if(!$assignedto)
{
- $default_group =
$config->config_data['tts_default_group'];
+ $default_group =
(int)$config->config_data['tts_default_group'];
}
else
{
@@ -572,7 +574,7 @@
$ticket = array(
'origin' => null,
'origin_id' => null,
- 'cat_id' =>
$values['cat_id'],
+ 'cat_id' => $cat_id,
'group_id' => ($default_group
? $default_group : null),
'assignedto'=> $assignedto,
'priority' => 3,
Modified: branches/Version-1_0-branch/rental/inc/class.soparty.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.soparty.inc.php
2011-11-02 11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/rental/inc/class.soparty.inc.php
2011-11-02 11:33:48 UTC (rev 7989)
@@ -410,6 +410,20 @@
return (int) $this->db->f('count',true);
}
+ public function has_contract($party_id)
+ {
+ $sql = "SELECT * FROM rental_contract_party WHERE
party_id={$party_id}";
+ $result = $this->db->query($sql);
+ if($this->db->next_record())
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
public function delete_party($party_id)
{
if($party_id)
Modified: branches/Version-1_0-branch/rental/inc/class.uiparty.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uiparty.inc.php
2011-11-02 11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/rental/inc/class.uiparty.inc.php
2011-11-02 11:33:48 UTC (rev 7989)
@@ -82,7 +82,7 @@
$config = CreateObject('phpgwapi.config','rental');
$config->read();
- $use_fellesdata = $config->config_data['use_fellesdata'];
+ $use_fellesdata = $config->config_data['use_fellesdata'];
switch($type)
{
case 'included_parties': // ... get all parties
incolved in the contract
@@ -113,7 +113,6 @@
$result_objects =
rental_soparty::get_instance()->get($start_index, $num_of_objects, $sort_field,
$sort_ascending, $search_for, $search_type, $filters);
$result_count =
rental_soparty::get_instance()->get_count($search_for, $search_type, $filters);
-
// Create an empty row set
$rows = array();
foreach ($result_objects as $party) {
@@ -143,13 +142,36 @@
{
$unit_id =
$unit_name_and_id['UNIT_ID'];
$unit_name =
$unit_name_and_id['UNIT_NAME'];
+
if(isset($unit_id) &&
is_numeric($unit_id))
{
$serialized['org_unit_name'] = isset($unit_name) ? $unit_name :
lang('no_name');
$serialized['org_unit_id'] = $unit_id;
}
+
+ // Fetches data from Fellesdata
+ $org_unit_id =
$sync_data['org_enhet_id'];
+
+ $org_unit_with_leader =
$bofelles->get_result_unit_with_leader($org_unit_id);
+ $org_department =
$bofelles->get_department_for_org_unit($org_unit_id);
+
+ $org_name =
$org_unit_with_leader['ORG_UNIT_NAME'];
+ $org_email =
$org_unit_with_leader['ORG_EMAIL'];
+ $unit_leader_fullname =
$org_unit_with_leader['LEADER_FULLNAME'];
+ $dep_org_name =
$org_department['DEP_ORG_NAME'];
+
+ // Fields are displayed in
syncronization table
+ $serialized['org_unit_name'] =
$org_name;
+ $serialized['unit_leader'] =
$unit_leader_fullname;
+ $serialized['org_email'] =
$org_email;
+ $serialized['dep_org_name'] =
$dep_org_name;
}
}
+
+ //check if party is a part of a contract
+ $party_in_contract =
rental_soparty::get_instance()->has_contract($party->get_id());
+ $serialized['party_in_contract'] =
$party_in_contract ? true : false;
+
$rows[] = $serialized;
}
}
@@ -172,7 +194,6 @@
);
}
-
return $this->yui_results($party_data, 'total_records',
'results');
}
@@ -340,7 +361,8 @@
$value['ajax'] = array();
$value['actions'] = array();
$value['labels'] = array();
-
+ $value['alert'] = array();
+
// Get parameters
$contract_id = $params[0];
$type = $params[1];
@@ -405,18 +427,24 @@
$value['labels'][] =
lang('frontend_access');
}
- if(isset($value['org_unit_id']))
+ if(isset($value['org_enhet_id']) &&
$value['org_enhet_id'] != '')
{
$value['ajax'][] = true;
- $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'rental.uiparty.syncronize_party', 'org_unit_id' => $value['org_unit_id'],
'party_id' => $value['id'])));
+ $value['alert'][] = true;
+
+ $alertMessage = "Du er i ferd
med å overskrive data med informasjon hentet fra Fellesdata.\n\n";
+ $alertMessage .= "Følgende felt
vil bli overskrevet: Foretak, Avdeling, Enhetsleder, Epost. \n\n";
+ $alertMessage .= "Vil du gjøre
dette?";
+
+ $value['alert'][] =
$alertMessage;
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'rental.uiparty.syncronize_party', 'org_enhet_id' => $value['org_enhet_id'],
'party_id' => $value['id'])));
$value['labels'][] =
lang('syncronize_party');
- }
+ }
}
break;
}
}
-
-
+
/**
* Public method. View all contracts.
*/
@@ -586,15 +614,48 @@
if(($this->isExecutiveOfficer() || $this->isAdministrator()))
{
$party_id = phpgw::get_var('party_id');
- $org_unit_id = phpgw::get_var('org_unit_id');
- $org_unit_name = phpgw::get_var('org_unit_id');
+ $org_unit_id = phpgw::get_var('org_enhet_id');
+
if(isset($party_id) && $party_id > 0 &&
isset($org_unit_id) && $org_unit_id > 0)
{
+ $config =
CreateObject('phpgwapi.config','rental');
+ $config->read();
+
+ $use_fellesdata =
$config->config_data['use_fellesdata'];
+ if(!$use_fellesdata){
+ return;
+ }
+
+ $bofelles = rental_bofellesdata::get_instance();
+
+ $org_unit_with_leader =
$bofelles->get_result_unit_with_leader($org_unit_id);
+ $org_department =
$bofelles->get_department_for_org_unit($org_unit_id);
+
+ $org_name =
$org_unit_with_leader['ORG_UNIT_NAME'];
+ $org_email = $org_unit_with_leader['ORG_EMAIL'];
+ $unit_leader_fullname =
$org_unit_with_leader['LEADER_FULLNAME'];
+ $dep_org_name = $org_department['DEP_ORG_NAME'];
+
$party =
rental_soparty::get_instance()->get_single($party_id);
- $party->set_org_enhet_id($org_unit_id);
- $patry->set_company_name($org_unit_name);
- // add log-statement for synchronization
+
+ if(!empty($dep_org_name) & $dep_org_name != '')
+ $party->set_department($dep_org_name);
+
+ if(!empty($unit_leader_fullname) &
$unit_leader_fullname != '')
+
$party->set_unit_leader($unit_leader_fullname);
+
+ if(!empty($org_name) & $org_name != '')
+ $party->set_company_name($org_name);
+
+ if(!empty($org_email) & $org_email != '')
+ $party->set_email($org_email);
+
+ if(!empty($org_unit_id) & $org_unit_id != '')
+ $party->set_org_enhet_id($org_unit_id);
+
rental_soparty::get_instance()->store($party);
+
+ $party =
rental_soparty::get_instance()->get_single($party_id);
}
}
}
@@ -633,8 +694,7 @@
$jsonArr = array("email" => trim($org_email),
"org_name" => trim($org_name),
"unit_leader_fullname" => trim($unit_leader_fullname), "department" =>
trim($dep_org_name));
- return json_decode( json_encode($jsonArr) );
-
+ return json_decode( json_encode($jsonArr) );
}
}
}
Modified:
branches/Version-1_0-branch/rental/inc/plugins/fellesdata/party.edit.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/plugins/fellesdata/party.edit.php
2011-11-02 11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/rental/inc/plugins/fellesdata/party.edit.php
2011-11-02 11:33:48 UTC (rev 7989)
@@ -8,11 +8,8 @@
?>
<select name="org_enhet_id" id="org_enhet_id">
<option value=""><?php echo
lang('no_party_location') ?></option>
- <?php
- var_dump("SKRIVER UT");
-
+ <?php
$result_units =
rental_bofellesdata::get_instance()->get_result_units();
- print_r($result_units);
$party_org_enhet_id = $party->get_org_enhet_id();
foreach ($result_units as $result_unit)
{
@@ -34,8 +31,6 @@
$party_org_enhet_id = $party->get_org_enhet_id();
if (isset($party_org_enhet_id) &&
is_numeric($party_org_enhet_id))
{
-
-
$result_unit =
rental_bofellesdata::get_instance()->get_result_unit($party_org_enhet_id);
echo $result_unit['ORG_NAME'];
}
Modified: branches/Version-1_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2011-11-02
11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2011-11-02
11:33:48 UTC (rev 7989)
@@ -400,7 +400,6 @@
orphan_units rental no Ubrukte arealer
or rental no eller
org_enhet_id rental no Organisasjonsenhet
-org_unit_person rental no Enhetsleder
org_unit_name rental no Navn på tilsvarende enhet i Fellesdata
org_unit_exist rental no Eksisterer
other_guarantee rental no Annen garanti
@@ -536,6 +535,10 @@
sync_parties_result_unit_number rental no Synkronisering:
Resultatenhetsnummer (Kontraktspart)
sync_parties_identifier rental no Synkronisering: Identifikator
sync_parties_fellesdata_id rental no Synkronisering:
Organisasjonsidentifikator
+sync_org_name_fellesdata rental no Foretak i Fellesdata
+sync_org_email_fellesdata rental no Epost i Fellesdata
+sync_org_unit_leader_fellesdata rental no Enhetsleder i Fellesdata
+sync_org_department_fellesdata rental no Avdeling i Fellesdata
syncronize_party rental no Synkroniser kontraktspart
System setting for project id can not be more than 6 characters. rental
no Systeminnstilling for prosjektnummer kan ikke være mer enn seks tegn.
System setting for responsibility id for the current user must be 6
characters. rental no Systeminnstilling for ansvar må være seks
tegn.
Modified: branches/Version-1_0-branch/rental/templates/base/common.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/common.php
2011-11-02 11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/rental/templates/base/common.php
2011-11-02 11:33:48 UTC (rev 7989)
@@ -259,6 +259,24 @@
//... check whether this action should be an
AJAX call
if(record.getData().ajax[task.index]) {
+
+ var alertStatus = false;
+
+ // Check if confirm box should be
displayed before request is executed
+ if( record.getData().alert != null )
+ alertStatus =
record.getData().alert[0];
+
+ if( alertStatus ){
+ // Display confirm box with
message
+ var alertMessage =
record.getData().alert[1];
+ var answer = confirm(
alertMessage );
+
+ // Abort request if user clicks
the abort button
+ if (!answer){
+ return false;
+ }
+ }
+
var request =
YAHOO.util.Connect.asyncRequest(
'GET',
record.getData().actions[
task.index ],
Modified: branches/Version-1_0-branch/rental/templates/base/css/base.css
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/css/base.css
2011-11-02 11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/rental/templates/base/css/base.css
2011-11-02 11:33:48 UTC (rev 7989)
@@ -184,7 +184,7 @@
}
dl.proplist-col input.address_2{
- margin-top:4px;
+ margin-top:2px;
}
div.identifier-header {
Modified: branches/Version-1_0-branch/rental/templates/base/party.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/party.php 2011-11-02
11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/rental/templates/base/party.php 2011-11-02
11:33:48 UTC (rev 7989)
@@ -330,6 +330,47 @@
<dt><label><?php
if($party->is_inactive()){?><font style="color: red;"><?php echo
lang('inactive_party');?></font><?php }else{ ?><font style="color:
green;"><?php echo lang('active_party');?></font><?php } ?></label></dt>
<dd> </dd>
<?php }?>
+
+ <dt>
+ <?php
if($party->get_unit_leader() || $editable) { ?>
+ <label for="unit_leader"><?php
echo lang('unit_leader') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ ?>
+ <input type="text"
name="unit_leader" id="unit_leader" value="<?php echo $party->get_unit_leader()
?>" />
+ <?php
+ }
+ else
+ {
+ echo
$party->get_unit_leader();
+ }
+ ?>
+ </dd>
+ </dl>
+ <dl class="proplist-col">
+ <dt>
+ <?php if($party->get_comment()
|| $editable) { ?>
+ <label for="comment"><?php echo
lang('comment') ?></label>
+ <?php } ?>
+ </dt>
+ <dd>
+ <?php
+ if ($editable)
+ {
+ ?>
+ <textarea cols="47" rows="7" name="comment"
id="comment"><?php echo $party->get_comment(); ?></textarea>
+ <?php
+ }
+ else
+ {
+ echo
$party->get_comment();
+ }
+ ?>
+ </dd>
<!--<dt>
<?php
if($party->get_location_id() || $editable) {?>
<label for="location_id"><?php
echo lang('party_location') ?></label>
@@ -394,48 +435,7 @@
include
PHPGW_SERVER_ROOT . "/rental/inc/plugins/fellesdata/party.edit.php";
}
?>
-
</dl>
- <dl class="proplist-col">
- <dt>
- <?php
if($party->get_unit_leader() || $editable) { ?>
- <label for="unit_leader"><?php
echo lang('unit_leader') ?></label>
- <?php } ?>
- </dt>
- <dd>
- <?php
- if ($editable)
- {
- ?>
- <input type="text"
name="unit_leader" id="unit_leader" value="<?php echo $party->get_unit_leader()
?>" />
- <?php
- }
- else
- {
- echo
$party->get_unit_leader();
- }
- ?>
- </dd>
- <dt>
- <?php if($party->get_comment()
|| $editable) { ?>
- <label for="comment"><?php echo
lang('comment') ?></label>
- <?php } ?>
- </dt>
- <dd>
- <?php
- if ($editable)
- {
- ?>
- <textarea cols="40" rows="7" name="comment"
id="comment"><?php echo $party->get_comment(); ?></textarea>
- <?php
- }
- else
- {
- echo
$party->get_comment();
- }
- ?>
- </dd>
- </dl>
<div class="form-buttons">
<span id="unit_errorMsg">Du må velge
organisasjonsenhet før du kan synkronisere</span>
<?php
Modified:
branches/Version-1_0-branch/rental/templates/base/party_list_partial.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/party_list_partial.php
2011-11-02 11:31:16 UTC (rev 7988)
+++ branches/Version-1_0-branch/rental/templates/base/party_list_partial.php
2011-11-02 11:33:48 UTC (rev 7989)
@@ -37,6 +37,10 @@
{
key: "ajax",
hidden: true
+ },
+ {
+ key: "alert",
+ hidden: true
}
];
Modified:
branches/Version-1_0-branch/rental/templates/base/sync_party_list_org_id.php
===================================================================
---
branches/Version-1_0-branch/rental/templates/base/sync_party_list_org_id.php
2011-11-02 11:31:16 UTC (rev 7988)
+++
branches/Version-1_0-branch/rental/templates/base/sync_party_list_org_id.php
2011-11-02 11:33:48 UTC (rev 7989)
@@ -12,8 +12,11 @@
$list_id = 'sync_parties_org_unit';
$url_add_on = '&type=sync_parties_org_unit';
$extra_cols = array(
- array("key" => "sync_message", "label" => lang('sync_message'),
"index" => 3),
- array("key" => "org_unit_name", "label" =>
lang('org_unit_name'), "index" => 4)
+ //array("key" => "sync_message", "label" =>
lang('sync_message'), "index" => 3),
+ array("key" => "org_unit_name", "label" =>
lang('sync_org_name_fellesdata'), "index" => 4),
+ array("key" => "dep_org_name", "label" =>
lang('sync_org_department_fellesdata'), "index" => 5),
+ array("key" => "unit_leader", "label" =>
lang('sync_org_unit_leader_fellesdata'), "index" => 6),
+ array("key" => "org_email", "label" =>
lang('sync_org_email_fellesdata'), "index" => 7)
);
include('party_list_partial.php');
?>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7989] Merge 7983:7988 from trunk,
Sigurd Nes <=