[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11292] Merge 11283:11291 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11292] Merge 11283:11291 from trunk |
|
Date: |
Fri, 13 Sep 2013 07:21:31 +0000 |
Revision: 11292
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11292
Author: sigurdne
Date: 2013-09-13 07:21:29 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
Merge 11283:11291 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
branches/Version-1_0-branch/logistic/js/logistic/assign_job.js
branches/Version-1_0-branch/logistic/setup/phpgw_no.lang
branches/Version-1_0-branch/logistic/setup/setup.inc.php
branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
branches/Version-1_0-branch/property/inc/class.bofiles.inc.php
branches/Version-1_0-branch/property/inc/class.interlink.inc.php
branches/Version-1_0-branch/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
branches/Version-1_0-branch/rental/inc/SnappyPdf.php
branches/Version-1_0-branch/rental/inc/class.uimakepdf.inc.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,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282
+
/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,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291
Modified:
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++
branches/Version-1_0-branch/logistic/inc/class.sorequirement_resource_allocation.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -116,7 +116,8 @@
$values = array(
'requirement_id=' .
$this->marshal($resource_alloc->get_requirement_id(), 'int'),
'resource_id=' .
$this->marshal($resource_alloc->get_resource_id(), 'int'),
- 'location_id=' .
$this->marshal($resource_alloc->get_location_id(), 'int')
+ 'location_id=' .
$this->marshal($resource_alloc->get_location_id(), 'int'),
+ 'ticket_id=' .
$this->marshal($resource_alloc->get_ticket_id(), 'int')
);
$result = $this->db->query('UPDATE
lg_requirement_resource_allocation SET ' . join(',', $values) . " WHERE
id={$id}", __LINE__,__FILE__);
@@ -246,6 +247,7 @@
$allocation->set_fm_bim_item_address($this->unmarshal($this->db->f('fm_bim_item_address'),
'string'));
$allocation->set_allocated_amount($this->unmarshal($this->db->f('count'),
'int'));
$allocation->set_inventory_id($this->unmarshal($this->db->f('inventory_id'),
'int'));
+
$allocation->set_ticket_id($this->unmarshal($this->db->f('ticket_id'), 'int'));
$fm_bim_name = $this->unmarshal(
$this->db->f('fm_bim_item_name'), 'string');
Modified: branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/logistic/inc/class.uirequirement.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -933,99 +933,110 @@
$requirement = $this->so->get_single($requirement_id);
- $custom =
createObject('phpgwapi.custom_fields');
+ $custom = createObject('phpgwapi.custom_fields');
//--
- $_filters = array('requirement_id' =>
$requirement_id);
- $requirement_values_array =
$this->so_requirement_value->get(0, false, $sort_field, $sort_ascending,
$search_for, $search_type, $_filters);
+ $_filters = array('requirement_id' => $requirement_id);
+ $requirement_values_array =
$this->so_requirement_value->get(0, false, $sort_field, $sort_ascending,
$search_for, $search_type, $_filters);
- $location_id = $requirement->get_location_id();
- $criterias = array();
- if( count( $requirement_values_array ) > 0 )
+ $location_id = $requirement->get_location_id();
+ $criterias = array();
+ if( count( $requirement_values_array ) > 0 )
+ {
+ foreach($requirement_values_array as
$requirement_value)
{
- foreach($requirement_values_array as
$requirement_value)
- {
- $loc_arr =
$GLOBALS['phpgw']->locations->get_name($location_id);
+ $loc_arr =
$GLOBALS['phpgw']->locations->get_name($location_id);
- $cust_attribute_id =
$requirement_value->get_cust_attribute_id();
+ $cust_attribute_id =
$requirement_value->get_cust_attribute_id();
- $attrib_data =
$custom->get('property', $loc_arr['location'], $cust_attribute_id);
+ $attrib_data = $custom->get('property',
$loc_arr['location'], $cust_attribute_id);
- $_criterie =
$attrib_data['input_text'];
+ $_criterie = $attrib_data['input_text'];
-
if(isset($attrib_data['choice']))
+ if(isset($attrib_data['choice']))
+ {
+ foreach ($attrib_data['choice']
as $_choice)
{
- foreach
($attrib_data['choice'] as $_choice)
+ if($_choice['id'] ==
$requirement_value->get_value())
{
-
if($_choice['id'] == $requirement_value->get_value())
- {
-
$_criterie .= "::{$_choice['value']}";
- break;
- }
+ $_criterie .=
"::{$_choice['value']}";
+ break;
}
}
- else
if($requirement_value->get_value())
- {
- $_criterie .=
"::{$requirement_value->get_value()}";
- }
+ }
+ else if($requirement_value->get_value())
+ {
+ $_criterie .=
"::{$requirement_value->get_value()}";
+ }
- $criterias[] = $_criterie;
+ $criterias[] = $_criterie;
-// $operator =
$requirement_value->get_operator();
- }
+// $operator =
$requirement_value->get_operator();
}
- $requirement_descr = $loc_arr['descr'] . '::' .
implode(',',$criterias);
- $message = 'Hva: ' . $requirement_descr .
"\n\n";
+ }
+
+
+ $path =
$this->so_activity->get_path($requirement->get_activity_id());
+
+ $breadcrumb_array = array();
+ foreach($path as $menu_item)
+ {
+ $breadcrumb_array[] = $menu_item['name'];
+ }
+
+ $title = implode(' -> ',$breadcrumb_array);
+
+
+ $message .= 'Hvor: ' . $title . "\n\n";
+ $requirement_descr = $loc_arr['descr'] . '::' .
implode(',',$criterias);
+ $message .= 'Hva: ' . $requirement_descr . "\n\n";
- #FIXME timezone..
-
//$GLOBALS['phpgw']->common->show_date($requirement->get_start_date())
- //$message .= 'Frist:' .
$GLOBALS['phpgw']->common->show_date($requirement->get_start_date()) . "\n\n";
+ #FIXME timezone..
+
//$GLOBALS['phpgw']->common->show_date($requirement->get_start_date())
+ //$message .= 'Frist:' .
$GLOBALS['phpgw']->common->show_date($requirement->get_start_date()) . "\n\n";
- $datetime_format =
"{$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']} H:i";
+ $datetime_format =
"{$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']} H:i";
- $when = date($datetime_format,
$requirement->get_start_date());
- $message .= 'Frist: ' . $when . "\n\n";
+ $when = date($datetime_format,
$requirement->get_start_date());
+ $message .= 'Frist: ' . $when . "\n\n";
- foreach ($allocations as $allocation)
- {
- $message .= 'Antall: ';
- $message .=
$allocation->get_allocated_amount();
- $message .= ' Fra: ';
+ foreach ($allocations as $allocation)
+ {
+ $message .= 'Antall: ';
+ $message .= $allocation->get_allocated_amount();
+ $message .= ' Fra: ';
- if($allocation->get_inventory_id())
+ if($allocation->get_inventory_id())
+ {
+ $inventory =
execMethod('property.soentity.get_inventory',array('inventory_id' =>
$allocation->get_inventory_id()));
+ $system_location =
$GLOBALS['phpgw']->locations->get_name($inventory[0]['p_location_id']);
+ $name = 'N∕A';
+ if( preg_match('/.location./i',
$system_location['location']) )
{
- $inventory =
execMethod('property.soentity.get_inventory',array('inventory_id' =>
$allocation->get_inventory_id()));
-
- $system_location =
$GLOBALS['phpgw']->locations->get_name($inventory[0]['p_location_id']);
-
- $name = 'N∕A';
- if( preg_match('/.location./i',
$system_location['location']) )
+ $location_code =
execMethod('property.solocation.get_location_code', $inventory[0]['p_id']);
+ $location =
execMethod('property.solocation.read_single', $location_code);
+ $location_arr = explode('-',
$location_code);
+ $i=1;
+ $name_arr = array();
+ foreach($location_arr as
$_dummy)
{
- $location_code =
execMethod('property.solocation.get_location_code', $inventory[0]['p_id']);
- $location =
execMethod('property.solocation.read_single', $location_code);
- $location_arr =
explode('-', $location_code);
- $i=1;
- $name_arr = array();
- foreach($location_arr
as $_dummy)
- {
- $name_arr[] =
$location["loc{$i}_name"];
- $i++;
- }
-
- $name = implode('::',
$name_arr);
+ $name_arr[] =
$location["loc{$i}_name"];
+ $i++;
}
- else if(
preg_match('/.entity./i', $system_location['location']) )
- {
- $name =
execMethod('property.soentity.get_short_description',
-
array('location_id' => $inventory[0]['p_location_id'], 'id' =>
$inventory[0]['p_id']));
- }
+ $name = implode('::',
$name_arr);
}
+ else if( preg_match('/.entity./i',
$system_location['location']) )
+ {
+ $name =
execMethod('property.soentity.get_short_description',
+
array('location_id' => $inventory[0]['p_location_id'], 'id' =>
$inventory[0]['p_id']));
+ }
- $message .= "$name ($location_code)\n";
+ }
- }
+ $message .= "$name ($location_code)\n";
+ }
// --------
@@ -1036,18 +1047,9 @@
$categories =
$catsObj->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $this->cat_id, 'use_acl' =>
$this->_category_acl));
- $path =
$this->so_activity->get_path($requirement->get_activity_id());
-
- $breadcrumb_array = array();
- foreach($path as $menu_item)
- {
- $breadcrumb_array[] = $menu_item['name'];
- }
-
- $title = implode(' -> ',$breadcrumb_array);
-
$data = array
(
+ 'requirement_id' =>
$requirement_id,
'title'
=> $title,
'title_size' =>
strlen($title) > 20 ? strlen($title) : 20,
'categories' =>
$categories,
@@ -1126,39 +1128,48 @@
$botts = CreateObject('property.botts',true);
$message_ticket_id = $botts->add_ticket($ticket);
- $location_id_ticket =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket');
+ if($location_id_ticket =
$GLOBALS['phpgw']->locations->get_id('property', '.ticket'))
+ {
+//---Sigurd: start register allocation to ticket
+ $GLOBALS['phpgw']->db->transaction_begin();
-//---Sigurd: start register component to ticket
+ $user_id = $GLOBALS['phpgw_info']['user']['id'];
- $user_id = $GLOBALS['phpgw_info']['user']['id'];
+ $interlink_verify = array();
+ foreach ($assign_requirement as $assign_entry)
+ {
+ $assign_arr = explode('_',
$assign_entry);
+ $requirement_id = $assign_arr[0];
+ $allocation_id = $assign_arr[1];
+ $location_id = $assign_arr[2];
+ $item_id = $assign_arr[3];
+ $inventory_id = (int)$assign_arr[4];
- foreach ($assign_requirement as $assign_entry)
- {
- $assign_arr = explode('_', $assign_entry);
- $requirement_id = $assign_arr[0];
- $allocation_id = $assign_arr[1];
- $location_id = $assign_arr[2];
- $item_id = $assign_arr[3];
- $inventory_id = (int)$assign_arr[4];
+ $interlink_data = array
+ (
+ 'location1_id' =>
$location_id,
+ 'location1_item_id' => $item_id,
+ 'location2_id' =>
$location_id_ticket,
+ 'location2_item_id' =>
$message_ticket_id,
+ 'account_id' => $user_id
+ );
- $interlink_data = array
- (
- 'location1_id' => $location_id,
- 'location1_item_id' => $item_id,
- 'location2_id' =>
$location_id_ticket,
- 'location2_item_id' =>
$message_ticket_id,
- 'account_id' => $user_id
- );
+
if(!isset($interlink_verify[$location_id][$item_id][$location_id_ticket][$message_ticket_id]))
+ {
+
execMethod('property.interlink.add', $interlink_data);
+
$interlink_verify[$location_id][$item_id][$location_id_ticket][$message_ticket_id]
= true;
+ }
- execMethod('property.interlink.add',
$interlink_data);
+ $allocation =
$this->so_resource_allocation->get_single($allocation_id);
+
$allocation->set_ticket_id($message_ticket_id);
+
$this->so_resource_allocation->store($allocation);
+ }
- $allocation =
$this->so_resource_allocation->get_single($allocation_id);
- $allocation->set_ticket_id($message_ticket_id);
-
$this->so_resource_allocation->store($allocation);
+ $GLOBALS['phpgw']->db->transaction_commit();
}
-//---End register component to ticket
+//---End register allocation to ticket
}
Modified:
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++
branches/Version-1_0-branch/logistic/inc/class.uirequirement_resource_allocation.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -239,21 +239,22 @@
$rows = array();
$lang_delete = lang('delete');
$lang_assign = lang('assign');
+ $lang_ticket = lang('ticket');
foreach ($result_objects as $result)
{
if (isset($result))
{
- $requirement = $result->serialize();
+ $allocation = $result->serialize();
if($short_desc =
execMethod('property.soentity.get_short_description',
- array('location_id' =>
$requirement['location_id'], 'id' => $requirement['resource_id'])))
+ array('location_id' =>
$allocation['location_id'], 'id' => $allocation['resource_id'])))
{
-
$requirement['fm_bim_item_name'] = $short_desc;
+ $allocation['fm_bim_item_name']
= $short_desc;
}
- if($requirement['inventory_id'])
+ if($allocation['inventory_id'])
{
- $inventory =
execMethod('property.soentity.get_inventory',array('inventory_id' =>
$requirement['inventory_id']));
+ $inventory =
execMethod('property.soentity.get_inventory',array('inventory_id' =>
$allocation['inventory_id']));
$system_location =
$GLOBALS['phpgw']->locations->get_name($inventory[0]['p_location_id']);
@@ -279,25 +280,40 @@
array('location_id' => $inventory[0]['p_location_id'], 'id' =>
$inventory[0]['p_id']));
}
- $requirement['location_code'] =
$location_code;
-
$requirement['fm_bim_item_address'] = $name;
+ $allocation['location_code'] =
$location_code;
+
$allocation['fm_bim_item_address'] = $name;
}
$delete_href =
self::link(array('menuaction' =>
'logistic.uirequirement_resource_allocation.delete',
-
'id' =>
$requirement['id'],
+
'id' =>
$allocation['id'],
'phpgw_return_as' =>
'json')
);
- $delete_href =
"javascript:load_delete_allocation({$requirement['id']});";
+ $delete_href =
"javascript:load_delete_allocation({$allocation['id']});";
- $requirement['delete_link'] = "<a
class=\"btn-sm \" href=\"{$delete_href}\">{$lang_delete}</a>";
+ $allocation['delete_link'] = "<a
class=\"btn-sm \" href=\"{$delete_href}\">{$lang_delete}</a>";
- $assign_href =
"javascript:load_assign_task(document.assign_task, {$requirement['id']});";
+ $assign_href =
"javascript:load_assign_task(document.assign_task, {$allocation['id']});";
+
+ $disabled = $allocation['ticket_id'] ?
'disabled = "disabled"' : '';
- $requirement['assign_job'] = "<input
name='assign_requirement' type='checkbox'
value='{$requirement_id}_{$requirement['id']}_{$requirement['location_id']}_{$requirement['resource_id']}_{$requirement['inventory_id']}'
/>"
+ if($allocation['ticket_id'])
+ {
+
+ $related_href =
self::link(array('menuaction' => 'property.uitts.view','id' =>
$allocation['ticket_id']));
+ $allocation['related'] = "<a
href=\"{$related_href}\">{$lang_ticket} #{$allocation['ticket_id']}</a>";
+
+ $relation_info =
execMethod('property.interlink.get_relation_info',
+
array('location' => '.ticket', 'id' => $allocation['ticket_id']));
+
+ $allocation['status'] =
$relation_info['statustext'];
+ }
+
+ $allocation['assign_job'] = "<input
name='assign_requirement' type='checkbox' {$disabled}
value='{$requirement_id}_{$allocation['id']}_{$allocation['location_id']}_{$allocation['resource_id']}_{$allocation['inventory_id']}'
/>"
. "<a class=\"btn-sm assign\"
href=\"{$assign_href}\">{$lang_assign}</a>";
+
- $rows[] = $requirement;
+ $rows[] = $allocation;
}
}
Modified:
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
===================================================================
---
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++
branches/Version-1_0-branch/logistic/inc/model/class.requirement_resource_allocation.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -49,6 +49,8 @@
protected $end_date;
protected $allocated_amount;
protected $allocated_amount_orig;
+ protected $ticket_id;
+
/**
* Constructor. Takes an optional ID. If a contract is
created from outside
* the database the ID should be empty so the database can add
one according to its logic.
@@ -213,6 +215,18 @@
}
+
+ public function set_ticket_id($ticket_id)
+ {
+ $this->ticket_id = $ticket_id;
+ }
+
+ public function get_ticket_id()
+ {
+ return $this->ticket_id;
+ }
+
+
/**
* Get a static reference to the storage object associated with
this model object
*
@@ -236,6 +250,7 @@
'requirement_id' =>
$this->get_requirement_id(),
'resource_id' =>
$this->get_resource_id(),
'inventory_id' =>
$this->get_inventory_id(),
+ 'ticket_id' =>
$this->get_ticket_id(),
//FIXME
'inventory_amount' =>
$this->get_inventory_amount(),
'allocated_amount' =>
$this->get_allocated_amount(),
Modified: branches/Version-1_0-branch/logistic/js/logistic/assign_job.js
===================================================================
--- branches/Version-1_0-branch/logistic/js/logistic/assign_job.js
2013-09-13 07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/logistic/js/logistic/assign_job.js
2013-09-13 07:21:29 UTC (rev 11292)
@@ -5,6 +5,8 @@
// REGISTER MESSAGE
$("#frmRegCaseMessage").submit(function(e){
+ e.preventDefault();
+
var thisForm = $(this);
var $required_input_fields = $(this).find(".required");
@@ -48,10 +50,21 @@
}
});
- if( !status )
+ if( status )
{
- e.preventDefault();
- }
+
+ var requestUrl = $(thisForm).attr("action");
+ $.ajax({
+ type: 'POST',
+ url: requestUrl + "&" +
$(thisForm).serialize(),
+ success: function(data) {
+
parent.closeJS_local_allocation(requirement_id);
+ parent.TINY.box.hide();
+ }
+ });
+ }
+
+
});
Modified: branches/Version-1_0-branch/logistic/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/logistic/setup/phpgw_no.lang 2013-09-13
07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/logistic/setup/phpgw_no.lang 2013-09-13
07:21:29 UTC (rev 11292)
@@ -115,3 +115,5 @@
Responsible person for activity logistic no Angi hvilken
person som skal være ansvarlig for aktiviteten
allocated date logistic no Allokert når
allocated where logistic no Allokert hvor
+assign ticket logistic no Bestill oppdrag
+assign logistic no Bestill
Modified: branches/Version-1_0-branch/logistic/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/setup.inc.php 2013-09-13
07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/logistic/setup/setup.inc.php 2013-09-13
07:21:29 UTC (rev 11292)
@@ -1,6 +1,6 @@
<?php
$setup_info['logistic']['name'] = 'logistic';
- $setup_info['logistic']['version'] = '0.0.6';
+ $setup_info['logistic']['version'] = '0.0.7';
$setup_info['logistic']['app_order'] = 70;
$setup_info['logistic']['enable'] = 1;
$setup_info['logistic']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/logistic/setup/tables_current.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -99,6 +99,8 @@
'calendar_id' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
'create_user' => array('type'
=> 'int', 'precision' => 4, 'nullable' => false),
'create_date' => array('type'
=> 'int', 'precision' => 8, 'nullable' => false),
+ 'ticket_id' => array('type' =>
'int', 'precision' => 4, 'nullable' => false),
+
),
'pk' => array('id'),
'fk' => array(
Modified: branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/logistic/setup/tables_update.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -195,3 +195,21 @@
}
}
+
+ $test[] = '0.0.6';
+ function logistic_upgrade0_0_6()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('lg_requirement_resource_allocation','ticket_id',array(
+ 'type' => 'int',
+ 'precision' => 4,
+ 'nullable' => true
+ ));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['logistic']['currentver'] =
'0.0.7';
+ return $GLOBALS['setup_info']['logistic']['currentver'];
+ }
+ }
Modified:
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
===================================================================
---
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
2013-09-13 07:17:32 UTC (rev 11291)
+++
branches/Version-1_0-branch/logistic/templates/base/allocation/assign_job.xsl
2013-09-13 07:21:29 UTC (rev 11292)
@@ -25,6 +25,10 @@
<xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:logistic.uirequirement.send_job_ticket')" />
</xsl:variable>
+ <script type="text/javascript">
+ var requirement_id = <xsl:value-of
select="requirement_id"/>;
+ </script>
+
<form ENCTYPE="multipart/form-data"
id="frmRegCaseMessage" action="{$action_url}" method="post">
<input name="assign_requirement"
type="text" value="{assign_requirement_json}" />
Modified: branches/Version-1_0-branch/property/inc/class.bofiles.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bofiles.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/property/inc/class.bofiles.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -158,6 +158,8 @@
foreach ($values['file_action'] as $file_name)
{
+ $file_name = html_entity_decode($file_name);
+
$file = "{$this->fakebase}{$path}{$file_name}";
if($this->vfs->file_exists(array(
@@ -203,10 +205,11 @@
if(!$file)
{
- $file_name =
urldecode(phpgw::get_var('file_name'));
+ $file_name =
html_entity_decode(urldecode(phpgw::get_var('file_name')));
$id = phpgw::get_var('id');
$file =
"{$this->fakebase}/{$type}/{$id}/{$file_name}";
}
+
// prevent path traversal
if ( preg_match('/\.\./', $file) )
{
Modified: branches/Version-1_0-branch/property/inc/class.interlink.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.interlink.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/property/inc/class.interlink.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -351,10 +351,10 @@
* @return string info of the linked item
*/
- public function get_relation_info($linkend_location, $id)
+ public function get_relation_info($linkend_location, $id=0)
{
$relation_info = array();
- $id = (int)$id;
+ $id = isset($linkend_location['id']) ?
(int)$linkend_location['id'] : (int)$id;
$type = $linkend_location['location'];
if($type == '.ticket')
{
Modified:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
2013-09-13 07:17:32 UTC (rev 11291)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
2013-09-13 07:21:29 UTC (rev 11292)
@@ -113,7 +113,7 @@
$i++;
}
-
+ $values['spbudact_code'] =
$workorder['b_account_id'];
$values['invoice_date'] = $this->date;
$values['payment_date'] = $this->date;
$values['paid_date'] = $this->date;
Modified: branches/Version-1_0-branch/rental/inc/SnappyPdf.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/SnappyPdf.php 2013-09-13
07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/rental/inc/SnappyPdf.php 2013-09-13
07:21:29 UTC (rev 11292)
@@ -36,7 +36,8 @@
'lowquality' => true,
'username' => null,
'password' => null,
+ 'minimum-font-size' => 16,
);
}
-?>
\ No newline at end of file
+?>
Modified: branches/Version-1_0-branch/rental/inc/class.uimakepdf.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uimakepdf.inc.php
2013-09-13 07:17:32 UTC (rev 11291)
+++ branches/Version-1_0-branch/rental/inc/class.uimakepdf.inc.php
2013-09-13 07:21:29 UTC (rev 11292)
@@ -452,9 +452,14 @@
$_SESSION['contract_html'] = "";
$pdf_file_name = $tmp_dir .
"/temp_contract_".strtotime(date('Y-m-d')).".pdf";
+
//var_dump($config->config_data['path_to_wkhtmltopdf']);
//var_dump($GLOBALS['phpgw_info']);
$wkhtmltopdf_executable =
$config->config_data['path_to_wkhtmltopdf'];
+ if(!is_file($wkhtmltopdf_executable))
+ {
+ throw new Exception('wkhtmltopdf not configured
correctly');
+ }
$snappy = new SnappyPdf();
//$snappy->setExecutable('/opt/portico/pe/rental/wkhtmltopdf-i386'); // or
whatever else
$snappy->setExecutable($wkhtmltopdf_executable); // or
whatever else
@@ -462,6 +467,11 @@
$contract_id = phpgw::get_var('id');
+ if(!is_file($pdf_file_name))
+ {
+ throw new Exception('pdf-file not produced');
+ }
+
$this->savePDFToContract($pdf_file_name, $contract_id,
'Kontrakt');
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11292] Merge 11283:11291 from trunk,
Sigurd Nes <=