[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11461] Merge 11446:11460 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11461] Merge 11446:11460 from trunk |
|
Date: |
Wed, 13 Nov 2013 20:29:43 +0000 |
Revision: 11461
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11461
Author: sigurdne
Date: 2013-11-13 20:29:42 +0000 (Wed, 13 Nov 2013)
Log Message:
-----------
Merge 11446:11460 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
branches/Version-1_0-branch/property/inc/class.boXport.inc.php
branches/Version-1_0-branch/property/inc/class.uidimb_role_user.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
branches/Version-1_0-branch/property/inc/import/import_update_generic.php
branches/Version-1_0-branch/property/setup/phpgw_no.lang
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,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445
+
/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,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460
Modified: branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2013-11-13 20:27:08 UTC (rev 11460)
+++ branches/Version-1_0-branch/controller/inc/class.uicheck_list.inc.php
2013-11-13 20:29:42 UTC (rev 11461)
@@ -484,13 +484,25 @@
if($check_list_id > 0)
{
$check_list =
$this->so->get_single($check_list_id);
- if(! $this->_check_for_required($check_list) )
+
+ if($status ==
controller_check_list::STATUS_DONE)
{
- $this->redirect(array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
+ if(!
$this->_check_for_required($check_list) )
+ {
+
$this->redirect(array('menuaction' =>
'controller.uicheck_list.edit_check_list', 'check_list_id' => $check_list_id));
+ }
}
}
else
{
+ if($status ==
controller_check_list::STATUS_DONE)
+ {
+ $status =
controller_check_list::STATUS_NOT_DONE;
+ $completed_date_ts = 0;
+ $error_message = "Status kunne ikke
settes til utført - prøv igjen";
+
phpgwapi_cache::message_set($error_message, 'error');
+ }
+
$check_list = new controller_check_list();
$check_list->set_control_id($control_id);
$location_code =
phpgw::get_var('location_code');
Modified: branches/Version-1_0-branch/property/inc/class.boXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boXport.inc.php
2013-11-13 20:27:08 UTC (rev 11460)
+++ branches/Version-1_0-branch/property/inc/class.boXport.inc.php
2013-11-13 20:29:42 UTC (rev 11461)
@@ -37,8 +37,9 @@
var $public_functions = array
(
- 'import' => true,
- 'export' => true
+ 'import' => true,
+ 'export' => true,
+ 'export_cron' => true
);
var $start;
var $query;
@@ -307,14 +308,12 @@
function export_cron( $data )
{
- if ( $data['enabled'] == 1 )
+ $data = unserialize(urldecode(phpgw::get_var('data')));
+ $data = phpgw::clean_value($data);
+_debug_array($data);
+ $receipt = $this->export( $data );
{
- $receipt = $this->export( $data );
- //
if(isset($data['manual']))
- {
- _debug_array( $receipt );
- }
+ _debug_array( $receipt );
}
}
-
- }
\ No newline at end of file
+ }
Modified:
branches/Version-1_0-branch/property/inc/class.uidimb_role_user.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uidimb_role_user.inc.php
2013-11-13 20:27:08 UTC (rev 11460)
+++ branches/Version-1_0-branch/property/inc/class.uidimb_role_user.inc.php
2013-11-13 20:29:42 UTC (rev 11461)
@@ -215,7 +215,7 @@
array
(
'key' => 'alter_date',
- 'label' => lang('alter_date'),
+ 'label' => lang('alter date'),
'sortable' => false,
'formatter' => 'FormatterCenter',
),
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-11-13 20:27:08 UTC (rev 11460)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-11-13 20:29:42 UTC (rev 11461)
@@ -70,8 +70,27 @@
phpgwapi_cache::session_set('property',
'import_settings', $_POST);
- $this->conv_type =
phpgw::get_var('conv_type');
+ $check_method = 0;
+ if($this->conv_type =
phpgw::get_var('conv_type'))
+ {
+ $check_method ++;
+ }
+ if ($location_id =
phpgw::get_var('location_id', 'int'))
+ {
+ $check_method ++;
+ }
+
+ if($table = phpgw::get_var('table'))
+ {
+ $check_method ++;
+ }
+ if($check_method > 1)
+ {
+ phpgwapi_cache::session_set('property',
'import_message', 'choose only one target!');
+
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction'=>'property.uiimport.index'));
+ }
+
$start_time = time(); // Start time of import
$start = date("G:i:s",$start_time);
echo "<h3>Import started at: {$start}</h3>";
@@ -96,7 +115,7 @@
require_once PHPGW_SERVER_ROOT .
"/property/inc/import/import_update_generic.php";
}
- $location_id = phpgw::get_var('location_id',
'int');
+
$this->import_conversion = new
import_conversion($location_id);
$this->debug = phpgw::get_var('debug', 'bool');
$this->import_conversion->debug = $this->debug;
@@ -220,7 +239,8 @@
// $tables = $this->db->table_names();
$tables = array
(
- 'fm_vendor'
+ 'fm_vendor',
+ 'fm_condition_survey'
);
sort($tables);
@@ -242,7 +262,7 @@
foreach($category_list as $category)
{
- $selected =
$import_settings['category'] == $category ? 'selected = "selected"' : '';
+ $selected =
$import_settings['location_id'] == $category['location_id'] ? 'selected =
"selected"' : '';
$category_option .= <<<HTML
<option
value="{$category['location_id']}"{$selected}>{$category['name']}</option>
HTML;
Modified:
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
2013-11-13 20:27:08 UTC (rev 11460)
+++
branches/Version-1_0-branch/property/inc/cron/default/Import_fra_agresso_X205.php
2013-11-13 20:29:42 UTC (rev 11461)
@@ -423,19 +423,22 @@
{
if (is_dir($file))
{
-// echo "Directory:
$file<br/>";
+ echo "Directory:
$file<br/>";
continue;
}
-/* $size =
filesize("ssh2.sftp://$sftp$directory_remote/$file";);
- echo "File $file Size:
$size<br/>";
+/* if ($this->debug)
+ {
+ $size =
filesize("ssh2.sftp://$sftp$directory_remote/$file";);
+ echo "File $file Size:
$size<br/>";
- $stream =
@fopen("ssh2.sftp://$sftp$directory_remote/$file";, 'r');
- $contents = fread($stream,
filesize("ssh2.sftp://$sftp$directory_remote/$file";));
- @fclose($stream);
- echo "CONTENTS:
$contents<br/><br/>";
+ $stream =
@fopen("ssh2.sftp://$sftp$directory_remote/$file";, 'r');
+ $contents =
fread($stream, filesize("ssh2.sftp://$sftp$directory_remote/$file";));
+ @fclose($stream);
+ echo "CONTENTS:
$contents<br/><br/>";
+ }
*/
- $files[] = $file;
+ $files[] = $file;
}
if ($this->debug)
@@ -502,9 +505,7 @@
if (isset($var_result['INVOICES']) &&
is_array($var_result['INVOICES']))
{
- $transferdate = str_replace('.', '-',
$var_result['TRANSACTIONINFORMATION'][0]['TRANSFERDATE']);// 2009.05.28
- $transfertime =
$var_result['TRANSACTIONINFORMATION'][0]['TRANSFERTIME'];// 13:10:28
- $regtid =
date($this->datetimeformat,strtotime("{$transferdate} {$transfertime}"));
+ $regtid = date($this->datetimeformat);
$i = 0;
$_data =
$var_result['INVOICES'][0]['INVOICE'][0]['INVOICEHEADER'][0];
Modified: branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
2013-11-13 20:27:08 UTC (rev 11460)
+++ branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
2013-11-13 20:29:42 UTC (rev 11461)
@@ -522,6 +522,10 @@
$this->log_end($batchid); //Lagre melding
}
+ if(!$vouchers)
+ {
+ $receipt['message'][]= array('msg' => 'Ingen
bilag funnet for overføring');
+ }
return $receipt;
}
Modified:
branches/Version-1_0-branch/property/inc/import/import_update_generic.php
===================================================================
--- branches/Version-1_0-branch/property/inc/import/import_update_generic.php
2013-11-13 20:27:08 UTC (rev 11460)
+++ branches/Version-1_0-branch/property/inc/import/import_update_generic.php
2013-11-13 20:29:42 UTC (rev 11461)
@@ -22,7 +22,7 @@
$this->db = & $GLOBALS['phpgw']->db;
$this->join = $this->db->join;
- if(! $category =
execMethod('property.soadmin_entity.get_single_category', $location_id ))
+ if($location_id && !$category =
execMethod('property.soadmin_entity.get_single_category', $location_id ))
{
throw new Exception("Not a valid location for
{$location_id}");
}
@@ -33,7 +33,7 @@
$this->entity_id = $category['entity_id'];
$this->cat_id = $category['id'];
-
+
if ($this->is_eav)
{
$this->table = 'fm_bim_item';
@@ -90,7 +90,7 @@
}
return $ok;
}
-
+
private function _add_eav($data)
{
static $count_records = 0;
@@ -171,14 +171,14 @@
$type = (int)$this->bim_type_id;
$location_name =
"_entity_{$this->entity_id}_{$this->cat_id}";
-
+
if($this->db->next_record())
{
$this->warnings[] = "ID finnes fra før: {$id},
oppdaterer";
foreach ($remove_keys as $remove_key)
{
- unset($value_set[$remove_key]);
+ unset($value_set[$remove_key]);
}
phpgw::import_class('phpgwapi.xmlhelper');
@@ -233,7 +233,7 @@
// Append it to the document itself
$doc->appendChild($domElement);
$doc->formatOutput = true;
-
+
$xml = $doc->saveXML();
if (function_exists('com_create_guid') === true)
@@ -339,7 +339,7 @@
{
foreach ($remove_keys as $remove_key)
{
- unset($value_set[$remove_key]);
+ unset($value_set[$remove_key]);
}
$this->warnings[] = "ID finnes fra før:
{$filtermethod}, oppdaterer";
@@ -361,29 +361,37 @@
}
else
{
- $request_ok =
$this->db->query($sql,__LINE__,__FILE__);
+ $ok = $this->db->query($sql,__LINE__,__FILE__);
}
- if(!$request_ok)
+ if($ok)
{
$this->messages[] = "Successfully imported
record: id ({$id})";
- $ok = true;
}
else
{
$this->errors[] = "Error importing record: id
({$id})";
- $ok = false;
}
return $ok;
}
protected function validate_value($value,$field)
{
+ $value = trim($value);
+
if($value == '#N/A')
{
return '';
}
- $datatype = $this->metadata[$field]['type'];
+
+ if(is_object($this->metadata[$field]))
+ {
+ $datatype = $this->metadata[$field]->type;
+ }
+ else
+ {
+ $datatype = $this->metadata[$field]['type'];
+ }
switch ($datatype)
{
case 'char':
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2013-11-13
20:27:08 UTC (rev 11460)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2013-11-13
20:29:42 UTC (rev 11461)
@@ -438,6 +438,9 @@
date closed property no dato avsluttet
date opened property no Startet
date search property no Dato søk
+date from property no Fra Dato
+date to property no Til Dato
+alter date property no Endre Dato
datetime property no dato-tid
day property no dag
day of week (0-6, 0=sun) property no Ukedag (0-6, 0=søndag)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11461] Merge 11446:11460 from trunk,
Sigurd Nes <=