[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10707] Merge 10704:10706 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10707] Merge 10704:10706 from trunk |
|
Date: |
Wed, 23 Jan 2013 08:47:03 +0000 |
Revision: 10707
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10707
Author: sigurdne
Date: 2013-01-23 08:47:03 +0000 (Wed, 23 Jan 2013)
Log Message:
-----------
Merge 10704:10706 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_values.xsl
branches/Version-1_0-branch/sms/bin/default/set_workorder_status.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,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703
+
/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,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706
Modified: branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2013-01-23 08:45:26 UTC (rev 10706)
+++ branches/Version-1_0-branch/logistic/inc/class.uiactivity.inc.php
2013-01-23 08:47:03 UTC (rev 10707)
@@ -220,7 +220,8 @@
'text' =>
lang('t_new_requirement'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
(
- 'menuaction' =>
'logistic.uirequirement.edit'
+ 'menuaction' =>
'logistic.uirequirement.edit',
+ 'nonavbar'
=> true
)),
'parameters' =>
json_encode($parameters3)
);
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-01-23 08:45:26 UTC (rev 10706)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-01-23 08:47:03 UTC (rev 10707)
@@ -49,6 +49,7 @@
private $so_project;
private $so_resource_type_requirement;
private $so_resource_allocation;
+ private $nonavbar;
public $public_functions = array(
'query'
=> true,
@@ -76,6 +77,18 @@
$this->so_resource_allocation =
CreateObject('logistic.sorequirement_resource_allocation');
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"logistic::project::requirement";
+
+/*
+ if( $this->nonavbar = phpgw::get_var('nonavbar',
'bool'))
+ {
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] =
$this->nonavbar;
+ $GLOBALS['phpgw_info']['flags']['noheader_xsl']
= true;
+ $GLOBALS['phpgw_info']['flags']['nofooter']
= true;
+ }
+*/
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] = true;
+ $GLOBALS['phpgw_info']['flags']['noheader_xsl'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter']
= true;
}
@@ -145,10 +158,17 @@
$rows[] = $result->serialize();
}
}
-
+//_debug_array($rows);
$line_id = 0; // optional preselect
foreach($rows as &$entry)
{
+
+//FIXME: hent verdier
+/*
+ $_filters = array('requirement_id' =>
$entry['id']);
+ $requirement_values_array =
$this->so_requirement_value->get(0, false, $sort_field, $sort_ascending,
$search_for, $search_type, $_filters);
+
+*/
$_checked = '';
if($entry['id'] == $line_id)
@@ -156,7 +176,7 @@
$_checked = 'checked="checked"';
}
- $num_required = $entry['no_of_items'];
+ $num_required = $entry['no_of_items'];
$filters = array('requirement_id' =>
$entry['id']);
$num_allocated =
$this->so_resource_allocation->get_count($search_for, $search_type, $filters);
@@ -179,7 +199,8 @@
$entry['alloc_link'] = "<a
class=\"btn-sm alloc\" href=\"{$href}\">Tildel ressurser</a>";
}
- $href = self::link(array('menuaction' =>
'logistic.uirequirement.edit', 'id' => $entry['id']));
+ //$href = self::link(array('menuaction' =>
'logistic.uirequirement.edit', 'id' => $entry['id']));
+ $href =
"javascript:load_requirement_edit_id({$entry['id']});";
$entry['edit_requirement_link'] = "<a
class=\"btn-sm alloc\" href=\"{$href}\">Endre behov</a>";
}
@@ -466,7 +487,6 @@
$GLOBALS['phpgw_info']['flags']['nofooter']
= true;
}
-
if ($requirement_id)
{
$requirement =
$this->so->get_single($requirement_id);
@@ -602,12 +622,12 @@
$data = array
(
- 'tabs'
=>
$GLOBALS['phpgw']->common->create_tabs($tabs, 1),
- 'view'
=> "requirement_values",
- 'requirement'
=> $requirement,
+ 'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 1),
+ 'view'
=> "requirement_values",
+ 'requirement'
=> $requirement,
'requirement_attributes_array' =>
$requirement_attributes_array,
- 'distict_locations'
=> $distict_locations_array,
- 'editable'
=> true,
+ 'distict_locations' =>
$distict_locations_array,
+ 'editable'
=> true,
);
if($activity_id > 0)
@@ -623,6 +643,13 @@
public function view_requirement_values()
{
+ if( $nonavbar = phpgw::get_var('nonavbar', 'bool'))
+ {
+ $GLOBALS['phpgw_info']['flags']['nonavbar'] =
$nonavbar;
+ $GLOBALS['phpgw_info']['flags']['noheader_xsl']
= true;
+ $GLOBALS['phpgw_info']['flags']['nofooter']
= true;
+ }
+
$requirement_id = phpgw::get_var('requirement_id');
if ($requirement_id && is_numeric($requirement_id))
@@ -732,7 +759,7 @@
$this->so_requirement_value->store($requirement_value);
}
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view_requirement_values',
'requirement_id' => $requirement_id));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'logistic.uirequirement.view_requirement_values',
'requirement_id' => $requirement_id, 'nonavbar' => $this->nonavbar));
}
public function get_custom_attributes($location_id,
$activity_id){
@@ -780,7 +807,8 @@
{
$tabs = array();
- if($requirement_id > 0){
+ if($requirement_id > 0)
+ {
$requirement =
$this->so->get_single($requirement_id);
@@ -788,13 +816,17 @@
array(
'label' => "1: " .
lang('Requirement details'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'logistic.uirequirement.view',
-
'id' => $requirement->get_id()))
+
'id' => $requirement->get_id(),
+
'nonavbar' => $this->nonavbar))
), array(
'label' => "2: " .
lang('Add constraints'),
'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'logistic.uirequirement.view_requirement_values',
-
'requirement_id' => $requirement->get_id()))
+
'requirement_id' => $requirement->get_id(),
+
'nonavbar' => $this->nonavbar))
));
- }else{
+ }
+ else
+ {
$tabs = array(
array(
'label' => "1: " .
lang('Requirement details')
Modified:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
2013-01-23 08:45:26 UTC (rev 10706)
+++
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_item.xsl
2013-01-23 08:47:03 UTC (rev 10707)
@@ -142,9 +142,9 @@
<input type="submit"
name="save_requirement" value="{$lang_save}" title = "{$lang_save}" />
<input type="submit"
name="cancel_requirement" value="{$lang_cancel}" title = "{$lang_cancel}" />
- <a style="margin-left: 20px;"
id="view-resources-btn" class="btn non-focus" href="{$view_resources_url}">
+ <!-- <a style="margin-left: 20px;"
id="view-resources-btn" class="btn non-focus" href="{$view_resources_url}">
<xsl:value-of
select="php:function('lang', 'View resources overview')" />
- </a>
+ </a>-->
</xsl:when>
<xsl:otherwise>
@@ -160,9 +160,9 @@
<xsl:value-of
select="php:function('lang', 'edit')" />
</a>
- <a style="margin-left: 20px;"
id="view-resources-btn" class="btn non-focus" href="{$view_resources_url}">
+ <!--<a style="margin-left:
20px;" id="view-resources-btn" class="btn non-focus"
href="{$view_resources_url}">
<xsl:value-of
select="php:function('lang', 'View resources overview')" />
- </a>
+ </a>-->
</xsl:otherwise>
</xsl:choose>
</div>
Modified:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
2013-01-23 08:45:26 UTC (rev 10706)
+++
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_overview.xsl
2013-01-23 08:47:03 UTC (rev 10707)
@@ -51,6 +51,13 @@
TINY.box.show({iframe:requestUrl,
boxid:'frameless',width:750,height:450,fixed:false,maskid:'darkmask',maskopacity:40,
mask:true, animate:true, close: true,closejs:function(){closeJS_local()}});
}
+ function load_requirement_edit_id( id ){
+ var oArgs = {menuaction: 'logistic.uirequirement.edit', id:id,
nonavbar: true, lean: true};
+ var requestUrl = phpGWLink('index.php', oArgs);
+
+ TINY.box.show({iframe:requestUrl,
boxid:'frameless',width:750,height:450,fixed:false,maskid:'darkmask',maskopacity:40,
mask:true, animate:true, close: true,closejs:function(){closeJS_local()}});
+ }
+
function closeJS_local()
{
var reqUrl = '<xsl:value-of select="//datatable/source"/>';
Modified:
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_values.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_values.xsl
2013-01-23 08:45:26 UTC (rev 10706)
+++
branches/Version-1_0-branch/logistic/templates/base/requirement/requirement_values.xsl
2013-01-23 08:47:03 UTC (rev 10707)
@@ -191,9 +191,9 @@
<input type="submit"
name="save_requirement_values" value="{$lang_save}" title = "{$lang_save}" />
<input type="submit"
name="cancel_requirement_values" value="{$lang_cancel}" title =
"{$lang_cancel}" />
- <a style="margin-left: 20px;"
id="view-resources-btn" class="btn non-focus" href="{$view_resources_url}">
+ <!--<a style="margin-left:
20px;" id="view-resources-btn" class="btn non-focus"
href="{$view_resources_url}">
<xsl:value-of
select="php:function('lang', 'View resources overview')" />
- </a>
+ </a>-->
</xsl:when>
<xsl:otherwise>
<xsl:variable name="params">
@@ -205,9 +205,9 @@
</xsl:variable>
<a class="btn"
href="{$edit_url}"><xsl:value-of select="php:function('lang', 'edit')" /></a>
- <a style="margin-left: 20px;"
id="view-resources-btn" class="btn non-focus" href="{$view_resources_url}">
+ <!--<a style="margin-left:
20px;" id="view-resources-btn" class="btn non-focus"
href="{$view_resources_url}">
<xsl:value-of
select="php:function('lang', 'View resources overview')" />
- </a>
+ </a>-->
</xsl:otherwise>
</xsl:choose>
</div>
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
2013-01-23 08:45:26 UTC (rev 10706)
+++ branches/Version-1_0-branch/sms/bin/default/set_workorder_status.php
2013-01-23 08:47:03 UTC (rev 10707)
@@ -51,6 +51,7 @@
{
$this->db->query("UPDATE
fm_project SET status = 'i_arbeid' WHERE id='{$project_id}'"
,__LINE__,__FILE__);
$historylog_project =
CreateObject('property.historylog','project');
+ $historylog_project->account =
6;
$historylog_project->add('S',$project_id,'i_arbeid', $status_old);
$historylog_project->add('RM',$project_id,"Bestilling {$workorder_id} endret
av: {$sms_sender}");
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10707] Merge 10704:10706 from trunk,
Sigurd Nes <=