[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11532] Merge 11527:11531 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11532] Merge 11527:11531 from trunk |
|
Date: |
Sun, 15 Dec 2013 15:17:14 +0000 |
Revision: 11532
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11532
Author: sigurdne
Date: 2013-12-15 15:17:13 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
Merge 11527:11531 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
branches/Version-1_0-branch/property/inc/class.boentity.inc.php
branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
Removed Paths:
-------------
branches/Version-1_0-branch/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb
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,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526
+
/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,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531
Modified: branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2013-12-14 20:25:26 UTC (rev 11531)
+++ branches/Version-1_0-branch/property/inc/class.bocommon.inc.php
2013-12-15 15:17:13 UTC (rev 11532)
@@ -1233,6 +1233,8 @@
$cols_return[] = 'loc' .
$location_types[$i]['id'];
}
+ $location_relation_data = array();
+ $custom =
createObject('property.custom_fields');
for ($i=1;$i<($type_id+1);$i++)
{
$cols.= ",loc{$i}_name";
@@ -1249,8 +1251,26 @@
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
$uicols['sortable'][] = $i == 1;
+
+ $fm_location_cols_temp =
$custom->find('property', '.location.' . $i, 0, '', '', '', true);
+ foreach ($fm_location_cols_temp as $entry)
+ {
+ if($entry['lookup_form'])
+ {
+ $location_relation_data[] =
array
+ (
+ 'level'
=> $i,
+ 'name'
=> $entry['name'],
+ 'descr'
=> $entry['input_text'],
+ 'status_text'
=> $entry['status_text'],
+ 'datatype'
=> $entry['datatype'],
+ );
+ }
+ }
}
+ phpgwapi_cache::system_set('property',
'location_relation_data', $location_relation_data);
+
if(!$no_address)
{
$cols.= ",$entity_table.address";
Modified: branches/Version-1_0-branch/property/inc/class.boentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2013-12-14 20:25:26 UTC (rev 11531)
+++ branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2013-12-15 15:17:13 UTC (rev 11532)
@@ -63,6 +63,7 @@
var $type_app = array();
var $type;
+ private $location_relation_data = array();
function __construct($session=false, $type = '', $entity_id =
0, $cat_id = 0)
{
@@ -224,6 +225,10 @@
$filter = array('list' => ''); // translates to "list
IS NULL"
$columns =
$this->custom->find($this->type_app[$this->type],".{$this->type}.{$entity_id}.{$cat_id}",
0, '','','',true, false, $filter);
$columns = array_merge( $columns,
$this->get_column_list() );
+ foreach ($columns as &$column)
+ {
+ $column['name'] = $column['descr'] ?
$column['descr'] : $column['input_text'];
+ }
$column_list=$this->bocommon->select_multi_list($selected,$columns);
return $column_list;
}
@@ -231,6 +236,32 @@
function get_column_list()
{
$columns = array();
+
+ // defined i property_bocommon::generate_sql()
+ $this->location_relation_data =
phpgwapi_cache::system_get('property', 'location_relation_data');
+
+ if( $this->location_relation_data &&
is_array($this->location_relation_data))
+ {
+ foreach ($this->location_relation_data as
$entry)
+ {
+ $columns[$entry['name']] = array
+ (
+ 'id' =>
$entry['name'],
+ 'input_type' => 'text',
+ 'name' =>
$entry['name'],
+ 'descr' =>
$entry['descr'],
+ 'statustext' =>
$entry['descr'],
+ 'align' => '',
+ 'datatype' =>
$entry['datatype'],
+ 'sortable' =>
false,
+ 'exchange' =>
false,
+ 'formatter' => '',
+ 'classname' => ''
+ );
+
+ }
+ }
+/*
$columns['user_id'] = array
(
'id' => 'user_id',
@@ -245,7 +276,7 @@
'formatter' => '',
'classname' => ''
);
-
+*/
return $columns;
}
@@ -370,23 +401,59 @@
$user_columns =
isset($GLOBALS['phpgw_info']['user']['preferences'][$this->type_app[$this->type]]["{$this->type}_columns_{$this->entity_id}_{$this->cat_id}"])?$GLOBALS['phpgw_info']['user']['preferences'][$this->type_app[$this->type]]["{$this->type}_columns_{$this->entity_id}_{$this->cat_id}"]:array();
$custom_cols = $this->get_column_list();
+
//_debug_array($user_columns);
//_debug_array($column_list);
+
+ $cols_extra = $this->so->cols_extra;
+ $cols_return_lookup =
$this->so->cols_return_lookup;
+
/*
foreach ($custom_cols as $col_id => $col_info)
{
if( in_array( $col_id, $user_columns ) )
{
- $cols_extra[] = array
- (
- 'name' => $col_id,
- 'datatype' =>
$column_list[$col_id]['datatype']
- );
+ $this->uicols['input_type'][] =
'text';
+ $this->uicols['name'][]
= $col_id;
+ $this->uicols['descr'][]
= $custom_cols[$col_id]['descr'];
+ $this->uicols['statustext'][] =
$custom_cols[$col_id]['descr'];
+ $this->uicols['exchange'][]
= false;
+ $this->uicols['align'][]
= '';
+ $this->uicols['datatype'][]
= $custom_cols[$col_id]['datatype'];
+ $this->uicols['formatter'][] = '';
+ $this->uicols['classname'][] = '';
+ $this->uicols['sortable'][]
= false;
+ $cols_extra[]
= $col_id;
}
}
*/
- $cols_extra = $this->so->cols_extra;
- $cols_return_lookup =
$this->so->cols_return_lookup;
+//_debug_array($cols_extra);
+//_debug_array($this->uicols);die();
+ $location_relation_data =
$this->location_relation_data;
+
+ if ($location_relation_data &&
is_array($location_relation_data))
+ {
+ foreach ($location_relation_data as $entry)
+ {
+ $this->uicols['input_type'][] =
'text';
+ $this->uicols['name'][]
= $entry['name'];
+ $this->uicols['descr'][]
= $entry['descr'];
+ $this->uicols['statustext'][] =
$entry['descr'];
+ $this->uicols['exchange'][]
= false;
+ $this->uicols['align'][]
= '';
+ $this->uicols['datatype'][]
= '';
+ $this->uicols['formatter'][] = '';
+ $this->uicols['classname'][] = '';
+ $this->uicols['sortable'][]
= false;
+
+ $cols_extra[]
= $entry['name'];
+
+ }
+ }
+
+ unset($entry);
+
+
//_debug_array($entity);
// _debug_array($cols_extra);
//_debug_array($cols_return_lookup);
Modified: branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2013-12-14 20:25:26 UTC (rev 11531)
+++ branches/Version-1_0-branch/property/inc/class.boinvoice.inc.php
2013-12-15 15:17:13 UTC (rev 11532)
@@ -310,7 +310,7 @@
}
else
{
- $_lag = date('n') == 1 ? 17 :
7;//6 days into next month, 16 days into next year
+ $_lag = date('n') == 1 ? 11 :
7;//6 days into next month, 10 days into next year
$_lag_seconds = $_lag * 24 * 3600;
}
Modified: branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2013-12-14 20:25:26 UTC (rev 11531)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2013-12-15 15:17:13 UTC (rev 11532)
@@ -61,7 +61,7 @@
'get_locations_by_name' => true
);
- function property_bolocation($session=false)
+ function __construct($session=false)
{
$this->soadmin_location =
CreateObject('property.soadmin_location');
$this->bocommon =
CreateObject('property.bocommon');
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-12-14 20:25:26 UTC (rev 11531)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-12-15 15:17:13 UTC (rev 11532)
@@ -54,7 +54,8 @@
$this->valid_tables = array
(
'fm_vendor' =>
'fm_vendor (' . lang('vendor') . ')',
- 'fm_condition_survey' => 'fm_condition_survey
(' . lang('condition survey') . ')'
+ 'fm_condition_survey' => 'fm_condition_survey
(' . lang('condition survey') . ')',
+ 'fm_ecodimb' => 'fm_ecodimb
(' . lang('dimb') . ')',
);
$location_types =
execMethod('property.soadmin_location.select_location_type');
Modified:
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2013-12-14 20:25:26 UTC (rev 11531)
+++
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2013-12-15 15:17:13 UTC (rev 11532)
@@ -36,7 +36,7 @@
class import_oppdatering_av_bestilling_fra_agresso_bkb
{
var $function_name =
'import_oppdatering_av_bestilling_fra_agresso_bkb';
- var $debug = false;
+ var $debug = true;
protected $updated_tickects = array();
protected $receipt = array();
@@ -308,6 +308,7 @@
{
_debug_array($files);
}
+die();
foreach($files as $file_name)
{
@@ -373,13 +374,15 @@
$agresso_prosjekt = (int)$data[0];
$prosjektstatus = trim($data[1]);
$order_id = trim($data[2]);
- $actual_cost = (float)trim($data[3]);
+ $diff_actual_cost = (float)trim($data[3]);
$this->db->query("SELECT id, status, actual_cost FROM
fm_tts_tickets WHERE order_id= '{$order_id}'",__LINE__,__FILE__);
$this->db->next_record();
- $id =
$this->db->f('id');
- $old_status =
$this->db->f('status');
- $old_actual_cost = $this->db->f('actual_cost');
+ $id
= $this->db->f('id');
+ $old_status =
$this->db->f('status');
+ (float) $old_actual_cost =
$this->db->f('actual_cost');
+
+ $new_actual_cost = $diff_actual_cost + $old_actual_cost;
if(!$id)
{
@@ -387,12 +390,12 @@
return false;
}
- $this->receipt['message'][] = array('msg' =>"Oppdaterer
melding #{$id}, gammelt beløp: {$old_actual_cost}, nytt beløp: {$actual_cost}");
+ $this->receipt['message'][] = array('msg' =>"Oppdaterer
melding #{$id}, gammelt beløp: {$old_actual_cost}, nytt beløp:
{$new_actual_cost}");
$value_set = array
(
- 'agresso_prosjekt' => $agresso_prosjekt,
- 'actual_cost' => $actual_cost
+ 'agresso_prosjekt' => $agresso_prosjekt,
+ 'actual_cost' => $new_actual_cost
);
$value_set =
$this->db->validate_update($value_set);
@@ -419,7 +422,7 @@
if(!$id)
{
- $this->receipt['error'][] = array('msg'
=>"Oppdatere status: fant ikke bestillingen, hopper over: {$order_id}");
+ $this->receipt['error'][] = array('msg'
=>"Oppdatere status: fant ikke bestillingen, hopper over: {$agresso_prosjekt}");
return false;
}
@@ -428,7 +431,7 @@
{
$ticket = array
(
- 'status' => 'C8'; //Avsluttet og
fakturert (C)
+ 'status' => 'C8' //Avsluttet og
fakturert (C)
);
if( $this->sotts->update_status($ticket,$id))
Modified: branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
===================================================================
--- branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
2013-12-14 20:25:26 UTC (rev 11531)
+++ branches/Version-1_0-branch/property/inc/export/default/Agresso_X114
2013-12-15 15:17:13 UTC (rev 11532)
@@ -92,7 +92,7 @@
}
else
{
- $_lag = date('n') == 1 ? 17 :
7;//6 days into next month, 16 days into next year
+ $_lag = date('n') == 1 ? 11 :
7;//6 days into next month, 10 days into next year
$_lag_seconds = $_lag * 24 * 3600;
}
Deleted:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb
2013-12-14 20:25:26 UTC (rev 11531)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb
2013-12-15 15:17:13 UTC (rev 11532)
@@ -1,93 +0,0 @@
-<?php
- class import_conversion
- {
- protected $db;
- public $messages = array();
- public $warnings = array();
- public $errors = array();
- public $fields = array();
- public $debug = true;
-
- public function __construct()
- {
- set_time_limit(10000); //Set the time limit for this
request
- $this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
- $this->db = & $GLOBALS['phpgw']->db;
-
phpgwapi_cache::session_clear('property','tts_listing_metadata');
- }
-
- public function add($data)
- {
- $fields = $this->fields;
-
- $agresso_prosjekt = $this->decode($data[0]);
- $prosjektstatus = $this->decode($data[1]);
- $order_id = $this->decode($data[2]);
- $actual_cost = (float)$this->decode($data[3]);
-
- $this->db->query("SELECT id, actual_cost FROM
fm_tts_tickets WHERE order_id= '{$order_id}'",__LINE__,__FILE__);
- $this->db->next_record();
- $id = $this->db->f('id');
- $old_actual_cost = $this->db->f('actual_cost');
-
- if(!$id)
- {
- $this->errors[] = "Fant ikke bestillingen,
hopper over: {$order_id}";
- return false;
- }
-
- $this->messages[] = "Oppdaterer melding #{$id}, gammelt
beløp: {$old_actual_cost}, nytt beløp: {$actual_cost}";
-
- $value_set = array
- (
- 'agresso_prosjekt' => $agresso_prosjekt,
- 'actual_cost' => $actual_cost
- );
-
- $value_set =
$this->db->validate_update($value_set);
- $ok = $this->db->query("UPDATE fm_tts_tickets SET
$value_set WHERE id={$id}",__LINE__,__FILE__);
-
-
-// $prosjektstatus;
-
-/*
- $ticket = array
- (
- 'status' => '';
- );
-
- $sotts = CreateObject('property.sotts');
- $sotts->update_status($ticket,$id)
-*/
- return $ok;
- }
-
-
- /**
- * Convert from the locale encoding to UTF-8 encoding and
escape single quotes
- *
- * @param string $value The value to convert
- * @return string
- */
- protected function decode($value)
- {
- $converted = trim($value);//
mb_convert_encoding($value, 'UTF-8');
- if ($this->is_null($converted))
- {
- return null;
- }
- return stripslashes($converted);
- }
-
- /**
- * Test a value for null according to several formats that can
exist in the export.
- * Returns true if the value is null according to these rules,
false otherwise.
- *
- * @param string $value The value to test
- * @return bool
- */
- protected function is_null($value)
- {
- return ((trim($value) == "") || ($data == "<NULL>") ||
($data == "''"));
- }
- }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11532] Merge 11527:11531 from trunk,
Sigurd Nes <=