[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11133] Merge 11130:11132 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11133] Merge 11130:11132 from trunk |
|
Date: |
Tue, 28 May 2013 08:07:13 +0000 |
Revision: 11133
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11133
Author: sigurdne
Date: 2013-05-28 08:07:12 +0000 (Tue, 28 May 2013)
Log Message:
-----------
Merge 11130:11132 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.boproject.inc.php
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/hook_config.inc.php
branches/Version-1_0-branch/property/templates/base/config.tpl
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
+
/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
Modified: branches/Version-1_0-branch/property/inc/class.boproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2013-05-24 13:37:49 UTC (rev 11132)
+++ branches/Version-1_0-branch/property/inc/class.boproject.inc.php
2013-05-28 08:07:12 UTC (rev 11133)
@@ -597,7 +597,7 @@
$sum_deviation+= $entry['deviation'];
$entry['cost'] = $entry['combined_cost'];
-
$entry['title']=htmlspecialchars_decode($entry['title']);
+ //
$entry['title']=htmlspecialchars_decode($entry['title']);
if(isset($entry['vendor_id']) &&
$entry['vendor_id'])
{
Modified:
branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2013-05-24 13:37:49 UTC (rev 11132)
+++ branches/Version-1_0-branch/property/inc/class.socondition_survey.inc.php
2013-05-28 08:07:12 UTC (rev 11133)
@@ -299,6 +299,12 @@
$config = CreateObject('phpgwapi.config','property');
$config->read();
+ if(!$survey['location_code'])
+ {
+ throw new
Exception('property_socondition_survey::import - condition survey location_code
not configured');
+ }
+
+ //FIXME
if(!isset($config->config_data['condition_survey_import_cat']) ||
!is_array($config->config_data['condition_survey_import_cat']))
{
throw new
Exception('property_socondition_survey::import - condition survey import
categories not configured');
@@ -314,6 +320,19 @@
throw new
Exception('property_socondition_survey::import - condition survey hidden status
not configured');
}
+ /**
+ * Park old request on the location and below as obsolete
+ */
+
if(isset($config->config_data['condition_survey_obsolete_status']) &&
$config->config_data['condition_survey_obsolete_status'])
+ {
+ $this->_db->query("UPDATE fm_request SET status
= '{$config->config_data['condition_survey_obsolete_status']}'"
+ . " WHERE location_code {$this->_db->like}
'{$survey['location_code']}%'",__LINE__,__FILE__);
+ }
+ else
+ {
+ throw new
Exception('property_socondition_survey::import - condition survey obsolete
status not configured');
+ }
+
$cats = CreateObject('phpgwapi.categories', -1,
'property', '.project');
$cats->supress_info = true;
$categories = $cats->return_sorted_array(0, false, '',
'', '', $globals = true, '', $use_acl = false);
@@ -357,7 +376,15 @@
$_update_buildingpart =
array("filter_{$filter_key}" => 1);
}
-//_debug_array($import_data);die();
+ foreach ($import_data as &$entry)
+ {
+ $entry['amount_investment'] = (int)
str_replace(array(' ', ','),array('','.'),$entry['amount_investment']);
+ $entry['amount_operation'] = (int)
str_replace(array(' ', ','),array('','.'),$entry['amount_operation']);
+ $entry['amount_potential_grants'] = (int)
str_replace(array(' ', ','),array('','.'),$entry['amount_potential_grants']);
+ }
+
+ unset($entry);
+
$origin_id =
$GLOBALS['phpgw']->locations->get_id('property', '.project.condition_survey');
foreach ($import_data as $entry)
{
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2013-05-24 13:37:49 UTC (rev 11132)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2013-05-28 08:07:12 UTC (rev 11133)
@@ -2664,7 +2664,7 @@
{
foreach ( $values['attributes'] as
&$attr )
{
- $attr['value'] =
$this->_db->f($attr['column_name']);
+ $attr['value'] =
$this->_db->f($attr['column_name'], true);
}
}
}
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2013-05-24 13:37:49 UTC (rev 11132)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2013-05-28 08:07:12 UTC (rev 11133)
@@ -309,7 +309,7 @@
$invoice[$i]['voucher_out_id']
= $invoice_temp['voucher_out_id'];
$invoice[$i]['invoice_count']
= $invoice_temp['invoice_count'];
$invoice[$i]['vendor_id']
= $this->db->f('spvend_code');
- $invoice[$i]['vendor']
= $this->db->f('org_name');
+ $invoice[$i]['vendor']
= $this->db->f('org_name',true);
$invoice[$i]['is_janitor']
= $role['is_janitor'];
$invoice[$i]['is_supervisor']
= $role['is_supervisor'];
$invoice[$i]['is_budget_responsible']
= $role['is_budget_responsible'];
@@ -471,7 +471,7 @@
// 'project_id'
=> $this->db->f('project_id'),
'workorder_id'
=> $this->db->f('pmwrkord_code'),
'order_id'
=> $this->db->f('pmwrkord_code'),
- 'status'
=> $this->db->f('status'),
+ 'status'
=> $this->db->f('status',true),
'closed'
=> !!$this->db->f('closed'),
'project_type_id'
=> $this->db->f('project_type_id'),
'periodization_id'
=> $this->db->f('periodization_id'),
@@ -484,12 +484,12 @@
'dimb'
=> $this->db->f('dimb'),
'dimd'
=> $this->db->f('dimd'),
'dime'
=> $this->db->f('dime'),
- 'remark'
=> !!$this->db->f('merknad'),
+ 'remark'
=> !!$this->db->f('merknad',true),
'tax_code'
=> $this->db->f('mvakode'),
'amount'
=> $this->db->f('belop'),
'approved_amount'
=> $this->db->f('godkjentbelop'),
'charge_tenant'
=> $this->db->f('charge_tenant'),
- 'vendor'
=> $this->db->f('org_name'),
+ 'vendor'
=> $this->db->f('org_name',true),
// 'paid_percent'
=> $this->db->f('paid_percent'),
'project_group'
=> $this->db->f('project_id'),
'external_ref'
=> $this->db->f('external_ref'),
@@ -594,7 +594,7 @@
'invoice_id' =>
$this->db->f('fakturanr'),
'amount'
=> $this->db->f('belop'),
'approved_amount' =>
$this->db->f('godkjentbelop'),
- 'vendor'
=> $this->db->f('org_name'),
+ 'vendor'
=> $this->db->f('org_name',true),
'currency'
=> $this->db->f('currency'),
'period'
=> $this->db->f('periode'),
'budget_responsible' =>
$this->db->f('budsjettansvarligid')
@@ -2449,7 +2449,7 @@
$bilagsnr = $this->db->f('bilagsnr');
$values[$bilagsnr]['bilagsnr_ut']
= $this->db->f('bilagsnr_ut');
- $values[$bilagsnr]['org_name']
= $this->db->f('org_name');
+ $values[$bilagsnr]['org_name']
= $this->db->f('org_name', true);
$values[$bilagsnr]['currency']
= $this->db->f('currency');
$values[$bilagsnr]['kreditnota']
= $this->db->f('kreditnota');
$values[$bilagsnr]['type']
= $this->db->f('type');
Modified: branches/Version-1_0-branch/property/inc/hook_config.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/hook_config.inc.php
2013-05-24 13:37:49 UTC (rev 11132)
+++ branches/Version-1_0-branch/property/inc/hook_config.inc.php
2013-05-28 08:07:12 UTC (rev 11133)
@@ -473,3 +473,32 @@
return $out;
}
+
+ /**
+ * Get HTML listbox with obsolete status that are to be set when
condition survey are imported
+ *
+ * @param $config
+ * @return string HTML listboxes to be placed in a table
+ */
+ function condition_survey_obsolete_status($config)
+ {
+ $status_entries =
execMethod('property.sorequest.select_status_list');
+
+ $status_assigned =
isset($config['condition_survey_obsolete_status']) ?
$config['condition_survey_obsolete_status'] : array();
+
+ $out = '<option value="">' . lang('none selected') .
'</option>' . "\n";
+ foreach ( $status_entries as $status)
+ {
+ $selected = '';
+ if ( $status_assigned == $status['id'])
+ {
+ $selected = 'selected = "selected"';
+ }
+
+ $out .= <<<HTML
+ <option
value='{$status['id']}'{$selected}>{$status['name']}</option>
+HTML;
+ }
+
+ return $out;
+ }
Modified: branches/Version-1_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/config.tpl
2013-05-24 13:37:49 UTC (rev 11132)
+++ branches/Version-1_0-branch/property/templates/base/config.tpl
2013-05-28 08:07:12 UTC (rev 11133)
@@ -564,6 +564,15 @@
</td>
</tr>
+ <tr class="row_on">
+
<td>{lang_obsolete_status_that_are_to_be_set_for_old_records_when_condition_survey_are_imported}:</td>
+ <td>
+ <select
name="newsettings[condition_survey_obsolete_status]">
+ {hook_condition_survey_obsolete_status}
+ </select>
+ </td>
+ </tr>
+
<!--
groupnotification
-->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11133] Merge 11130:11132 from trunk,
Sigurd Nes <=