[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11676] Merge 11660:11675 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11676] Merge 11660:11675 from trunk |
|
Date: |
Tue, 11 Feb 2014 20:00:20 +0000 |
Revision: 11676
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11676
Author: sigurdne
Date: 2014-02-11 20:00:19 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
Merge 11660:11675 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/schedule.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/templates/base/css/login.css
branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Service_EBF
branches/Version-1_0-branch/rental/inc/class.sobilling_info.inc.php
Removed Paths:
-------------
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Service
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,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659
+
/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,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675
Modified: branches/Version-1_0-branch/booking/inc/schedule.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/schedule.php 2014-02-11
19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/booking/inc/schedule.php 2014-02-11
20:00:19 UTC (rev 11676)
@@ -11,12 +11,14 @@
function get_to($a) {return $a['to_'];};
function cmp_from($a, $b) {return strcmp($a['from_'], $b['from_']);};
function cmp_to($a, $b) {return strcmp($a['to_'], $b['to_']);};
- while(true) {
+ while(true)
+ {
usort($bookings, 'cmp_from');
// No bookings left
if (count($bookings) == 0)
{
- if($t != '24:00') {
+ if($t != '24:00')
+ {
$data[] = array(
'time' => $t.'-00:00',
'_from' => $t,
@@ -38,19 +40,27 @@
continue;
}
// Bookings found
- else {
+ else
+ {
$next = array_filter(array_merge(array_map('get_from',
$bookings),
array_map('get_to', $bookings)),
create_function('$a', "return \$a > '$t';"));
+ if(!$next)
+ {
+ break;
+ }
$next_t = min($next);
+
$first_row = true;
- foreach($resources as $res) {
+ foreach($resources as $res)
+ {
$row = array('resource'=> $res['name'],
'resource_id' => $res['id']);
if($first_row)
{
$tmp_t = $next_t == '24:00' ? '00:00' :
$next_t;
$row['time'] = $t.'-'.$tmp_t;
}
+
$row['_from'] = $t;
$row['_to'] = $tmp_t;
$empty = true;
@@ -63,16 +73,19 @@
}
if(in_array($res['id'],
$booking['resources']))
{
- if(!(($tempbooking[$booking['wday']]['from_'] <=
$booking['from_']) and ($tempbooking[$booking['wday']]['to_'] ==
$booking['to_']) and ($tempbooking[$booking['wday']]['allocation_id'] ==
$booking['id']) and ($booking['type'] == 'allocation'))){
+ if(!(($tempbooking[$booking['wday']]['from_'] <=
$booking['from_']) and ($tempbooking[$booking['wday']]['to_'] ==
$booking['to_']) and ($tempbooking[$booking['wday']]['allocation_id'] ==
$booking['id']) and ($booking['type'] == 'allocation')))
+ {
$empty = false;
$row[$booking['wday']] =
$booking;
}
- if($booking['type'] == 'booking'){
+ if($booking['type'] == 'booking')
+ {
$tempbooking[$booking['wday']]
= $booking;
}
}
}
- if(!$empty) {
+ if(!$empty)
+ {
$data[] = $row;
$first_row = false;
}
@@ -84,7 +97,6 @@
array_shift($bookings);
}
}
-
}
return $data;
}
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
===================================================================
---
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -42,6 +42,7 @@
$location_url =
$c->config_data[$section]['location_url'];//'http://braarkiv.adm.bgo/service/services.asmx';
$braarkiv_user =
$c->config_data[$section]['braarkiv_user'];
$braarkiv_pass =
$c->config_data[$section]['braarkiv_pass'];
+//$location_url = 'http://braarkiv.adm.bgo/service/services.asmx';
if(!isset($c->config_data) || !$c->config_data)
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -78,6 +78,7 @@
switch ($file_store_contents)
{
+ case 'braArkiv':
case 'filesystem':
$this->file_actions = 1;
break;
@@ -86,7 +87,10 @@
break;
}
- $this->fileoperation =
CreateObject("phpgwapi.vfs_fileoperation_{$file_store_contents}");
+ if($this->file_actions)
+ {
+ $this->fileoperation =
CreateObject("phpgwapi.vfs_fileoperation_{$file_store_contents}");
+ }
$this->acl_default = $conf->config_data['acl_default'];
Modified: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -529,6 +529,9 @@
$this->tmpl->set_var('flag_no', $flag_no);
$this->tmpl->set_var('flag_en', $flag_en);
+ $this->tmpl->set_var('login_left_message',
$GLOBALS['phpgw_info']['login_left_message']);
+ $this->tmpl->set_var('login_right_message',
$GLOBALS['phpgw_info']['login_right_message']);
+
$autocomplete = '';
if (
isset($GLOBALS['phpgw_info']['server']['autocomplete_login'])
&&
$GLOBALS['phpgw_info']['server']['autocomplete_login'] )
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/css/login.css
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/css/login.css
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/css/login.css
2014-02-11 20:00:19 UTC (rev 11676)
@@ -55,6 +55,9 @@
#section-box { float: right; width: 320px; margin-left: 10px;}
+#left-box { float: left; margin-left:10px; margin-right:10px; margin-top:
50px;}
+#right-box { float: right; margin-left:10px; margin-right:10px; margin-top:
50px;}
+
#section-box .m {
padding: 5px;
}
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2014-02-11 20:00:19 UTC (rev 11676)
@@ -87,6 +87,13 @@
</div>
<div class="padding">
+ <div id="left-box">
+ {login_left_message}
+ </div>
+ <div id="right-box">
+ {login_right_message}
+ </div>
+
<div id="element-box" class="login">
<div class="t">
<div class="t">
@@ -214,6 +221,7 @@
</div>
<noscript>Warning! JavaScript must be enabled for
proper operation of the Administrator back-end.</noscript>
<div class="clr"></div>
+
</div>
</div>
<div id="border-bottom">
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -584,10 +584,10 @@
}
$groupmethod = "GROUP BY
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,"
- . "
currency,budsjettansvarligid,org_name,periode";
+ . "
currency,budsjettansvarligid,org_name,periode,periodization,periodization_start";
$sql = "SELECT DISTINCT
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,sum(belop) as belop,
sum(godkjentbelop) as godkjentbelop,"
- . "
currency,budsjettansvarligid,org_name,periode"
+ . "
currency,budsjettansvarligid,org_name,periode,periodization,periodization_start"
. " FROM {$table}"
. " {$this->join} fm_ecoart ON fm_ecoart.id =
$table.artid"
. " {$this->join} fm_workorder ON
fm_workorder.id = $table.pmwrkord_code"
@@ -611,6 +611,8 @@
'vendor'
=> $this->db->f('org_name',true),
'currency'
=> $this->db->f('currency'),
'period'
=> $this->db->f('periode'),
+ 'periodization' =>
$this->db->f('periodization'),
+ 'periodization_start' =>
$this->db->f('periodization_start'),
'budget_responsible' =>
$this->db->f('budsjettansvarligid')
);
}
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -1802,6 +1802,7 @@
$budget =
(int)$this->db->f('budget');
$combined_cost =
(int)$this->db->f('combined_cost');
+ $closed_order = (int)$this->db->f('closed');
$_order_budget[$period] = array
(
'order_id' =>
$order_id,
@@ -1811,7 +1812,7 @@
'year' =>
$year,
'month' =>
$month,
'actual_cost' => 0, //for
now..
- 'closed_order' =>
(int)$this->db->f('closed'),
+ 'closed_order' =>
$closed_order,
'active_period' =>
(int)$this->db->f('active'),
);
@@ -1843,15 +1844,26 @@
$order_budget = array();
if($continuous && $calculate_fictive_periods)
{
+ //First payment;
$sql = "SELECT periode"
. " FROM fm_workorder {$this->join}
fm_orders_paid_or_pending_view ON fm_workorder.id =
fm_orders_paid_or_pending_view.order_id"
- . " WHERE order_id = '{$order_id}' AND periode
> " . date('Y') . '00'
+ . " WHERE order_id = '{$order_id}' AND periode
> " . date('Y') . '00'
. " ORDER BY periode ASC";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
$current_paid_period =
(int)$this->db->f('periode');
+/*
+ //total payment;
+ $sql = "SELECT sum(actual_cost) AS actual_cost"
+ . " FROM fm_workorder {$this->join}
fm_orders_paid_or_pending_view ON fm_workorder.id =
fm_orders_paid_or_pending_view.order_id"
+ . " WHERE order_id = '{$order_id}' AND periode
> " . date('Y') . '00';
+
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ $_actual_cost = $this->db->f('actual_cost');
+*/
foreach ($_order_budget as $_period => $_budget)
{
if($_period == "{$_budget['year']}00"
&& $_budget['year'] == date('Y'))
@@ -1874,6 +1886,20 @@
$_current_month =
date('n'); // Numeric representation of a month, without leading zeros 1
through 12
}
+ $_sum_year_combined_cost =
$sum_year_combined_cost[$_budget['year']];
+
+/*
+ $_sum_year_combined_cost =
$sum_year_combined_cost[$_budget['year']] - $_actual_cost;
+
+
if($sum_year_combined_cost[$_budget['year']] > 0 )
+ {
+
$_sum_year_combined_cost = $_sum_year_combined_cost < 0 ? 0 :
$_sum_year_combined_cost;
+ }
+ else
+ {
+
$_sum_year_combined_cost = $_sum_year_combined_cost > 0 ? 0 :
$_sum_year_combined_cost;
+ }
+*/
$distribution_key = 1/(13 -
$_current_month);
for ($i = $_current_month;
$i<13; $i++)
@@ -1887,7 +1913,7 @@
$active_period[$period]
= $active_period[$_period] ? 1 : 0;
$order_budget[$period]
= $_budget;
$order_budget[$period]['budget'] =
$sum_year_budget[$_budget['year']] * $distribution_key;
-
$order_budget[$period]['combined_cost'] =
$sum_year_combined_cost[$_budget['year']] * $distribution_key;
+
$order_budget[$period]['combined_cost'] = $_sum_year_combined_cost *
$distribution_key;
$order_budget[$period]['active_period'] = $_budget['active_period'];
$order_budget[$period]['month'] = $i;
$closed_period[$period]
= (int)$period < date('Ym');
@@ -1917,26 +1943,97 @@
}
}
- $sql = "SELECT order_id, periode, amount AS
actual_cost, periodization, periodization_start"
+ $sql = "SELECT periode, amount AS actual_cost,
periodization, periodization_start"
. " FROM fm_workorder {$this->join}
fm_orders_paid_or_pending_view ON fm_workorder.id =
fm_orders_paid_or_pending_view.order_id"
. " WHERE order_id = '{$order_id}' ORDER BY periode
ASC";
-//_debug_array($sql);
+//_debug_array($sql);die();
$this->db->query($sql,__LINE__,__FILE__);
$orders_paid_or_pending = array();
+ $orders_paid_or_pending_temp = array();
while ($this->db->next_record())
{
- $orders_paid_or_pending[] = array
+ $orders_paid_or_pending_temp[] = array
(
'periode'
=> $this->db->f('periode'),
'actual_cost' =>
$this->db->f('actual_cost'),
- 'periodization' =>
$this->db->f('periodization'),
+ 'periodization' =>
(int)$this->db->f('periodization'),
'periodization_start' =>
$this->db->f('periodization_start'),
);
}
+ foreach ( $orders_paid_or_pending_temp as $entry)
+ {
+ if($entry['periodization'])
+ {
+ $periodization_start =
$entry['periodization_start'] ? $entry['periodization_start'] :
$entry['periodization'];
+
+ $periodization_start_year =
(int)substr($periodization_start, 0, 4 );
+ $periodization_start_month =
(int)substr($periodization_start, -2);
+
+ $sql = "SELECT month, value, dividend,
divisor"
+ . " FROM fm_eco_periodization_outline
WHERE periodization_id = {$entry['periodization']} ORDER BY month ASC";
+
$this->db->query($sql,__LINE__,__FILE__);
+
+ $periodization_outline = array();
+
+ while ($this->db->next_record())
+ {
+ $periodization_outline[] = array
+ (
+ 'month' =>
$this->db->f('month'),
+ 'value' =>
$this->db->f('value'),
+ 'dividend' =>
$this->db->f('dividend'),
+ 'divisor' =>
$this->db->f('divisor')
+ );
+ }
+ if (!$periodization_outline)
+ {
+ $periodization_outline[] = array
+ (
+ 'month' => 1,
+ 'value' => 100,
+ );
+ }
+
+ foreach ($periodization_outline as
$outline)
+ {
+ if ($outline['dividend'] &&
$outline['divisor'])
+ {
+ $partial_actual_cost =
$entry['actual_cost'] * $outline['dividend'] / $outline['divisor'];
+ }
+ else
+ {
+ $partial_actual_cost =
$entry['actual_cost'] * $outline['value'] / 100;
+ }
+
+ $_period_month =
(int)$periodization_start_month + (int)$outline['month'] -1;
+
+ $_future_year_count =
floor(($_period_month-1) / 12);
+
+ $_periodization_start_year =
$periodization_start_year + $_future_year_count;
+
+ $_month = $_period_month -
($_future_year_count * 12);
+
+ $orders_paid_or_pending[] =
array
+ (
+ 'periode'
=> sprintf("%s%02d",$_periodization_start_year, $_month),
+ 'actual_cost'
=> $partial_actual_cost,
+ 'periodization'
=> $entry['periodization'],
+ );
+ }
+
+ }
+ else
+ {
+ $orders_paid_or_pending[] = $entry;
+ }
+
+ }
+
foreach ( $orders_paid_or_pending as
$_orders_paid_or_pending)
{
+
$periode = $_orders_paid_or_pending['periode'];
$_dummy_period = $periode ? $periode :
date('Y') . '00';
@@ -1948,12 +2045,23 @@
$year = substr( $periode, 0, 4 );
$_found = false;
- if(isset($order_budget[$periode]))
+
+
if(isset($_orders_paid_or_pending['periodization']) &&
$_orders_paid_or_pending['periodization'])
{
$order_budget[$periode]['actual_cost']
+= $_orders_paid_or_pending['actual_cost'];
$order_budget[$periode]['actual_period'] = $periode;
+ $order_budget[$periode]['year'] = $year;
+ $order_budget[$periode]['month'] =
substr( $periode, -2 );
+ $order_budget[$periode]['closed_order']
= $closed_order;
+
$_found = true;
}
+ else if(isset($order_budget[$periode]))
+ {
+ $order_budget[$periode]['actual_cost']
+= $_orders_paid_or_pending['actual_cost'];
+
$order_budget[$periode]['actual_period'] = $periode;
+ $_found = true;
+ }
else
{
for ($i=0;$i<13;$i++)
@@ -1977,7 +2085,7 @@
$order_budget[$_dummy_period]['actual_period'] = $periode;
}
}
-
+//_debug_array($order_budget);die();
$sort_period = array();
$values = array();
$_current_period = date('Ym');
@@ -2047,7 +2155,7 @@
'sum_oblications' =>
$_sum_oblications,
'actual_cost' =>
$_actual_cost,
'closed_order' =>
$_budget['closed_order'],
- 'actual_period' =>
$_budget['actual_period']
+ 'actual_period' =>
$_budget['actual_period']
);
$sort_period[] = $period;
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -53,11 +53,13 @@
$this->valid_tables = array
(
- 'fm_vendor' =>
'fm_vendor (' . lang('vendor') . ')',
- 'fm_condition_survey' => 'fm_condition_survey
(' . lang('condition survey') . ')',
- 'fm_ecodimb' => 'fm_ecodimb
(' . lang('dimb') . ')',
- 'fm_budget' =>
'fm_budget (' . lang('budget') . ')',
- 'fm_department' =>
'fm_department (' . lang('department') . ')',
+ 'fm_vendor'
=> 'fm_vendor (' . lang('vendor') . ')',
+ 'fm_condition_survey' =>
'fm_condition_survey (' . lang('condition survey') . ')',
+ 'fm_ecodimb'
=> 'fm_ecodimb (' . lang('dimb') . ')',
+ 'fm_budget'
=> 'fm_budget (' . lang('budget') . ')',
+ 'fm_department'
=> 'fm_department (' . lang('department') . ')',
+ 'fm_eco_periodization_outline' =>
'fm_eco_periodization_outline (' . lang('periodization outline') . ')',
+ 'fm_eco_periodization' =>
'fm_eco_periodization (' . lang('periodization') . ')',
);
$location_types =
execMethod('property.soadmin_location.select_location_type');
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -2006,6 +2006,8 @@
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
array('key' =>
'approved_amount','label'=>lang('approved
amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
array('key' =>
'period','label'=>lang('period'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'periodization','label'=>lang('periodization'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'periodization_start','label'=>lang('periodization
start'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>true,'resizeable'=>true),
@@ -2476,6 +2478,8 @@
'workorder_id' =>
$entry['workorder_id'],
'status'
=> $entry['status'],
'period'
=> $entry['period'],
+ 'periodization' =>
$entry['periodization'],
+ 'periodization_start' =>
$entry['periodization_start'],
'invoice_id' =>
$entry['invoice_id'],
'budget_account' =>
$entry['budget_account'],
'dima'
=> $entry['dima'],
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -1775,6 +1775,8 @@
'voucher_out_id' =>
$entry['voucher_out_id'],
'status'
=> $entry['status'],
'period'
=> $entry['period'],
+ 'periodization' =>
$entry['periodization'],
+ 'periodization_start' =>
$entry['periodization_start'],
'invoice_id' =>
$entry['invoice_id'],
'budget_account' =>
$entry['budget_account'],
'dima'
=> $entry['dima'],
@@ -1821,6 +1823,8 @@
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'approved_amount','label'=>lang('approved
amount'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'period','label'=>lang('period'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'periodization','label'=>lang('periodization'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'periodization_start','label'=>lang('periodization
start'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'currency','label'=>lang('currency'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'type','label'=>lang('type'),'sortable'=>false,'resizeable'=>true),
array('key' =>
'budget_responsible','label'=>lang('budget
responsible'),'sortable'=>false,'resizeable'=>true),
Deleted:
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
2014-02-11 19:47:29 UTC (rev 11675)
+++
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Kemner_xml
2014-02-11 20:00:19 UTC (rev 11676)
@@ -1,247 +0,0 @@
-<?php
- /**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package property
- * @subpackage import
- * @version $Id: Import_fra_Kemner_xml,v 1.13 2007/03/18 16:33:16
sigurdne Exp $
- */
-
- /**
- * Description
- * @package property
- */
-
- class import_conv
- {
- var $spbudact_code='11954111';
- var $dimb=99;
- var $mvakode=0;
- var $kildeid=1;
- var $splitt=0;
- var $soXport;
- var $invoice;
-
- var $import = array(
- 'Bilagsnr' => 'bilagsnr',
- 'Fakturanr' => 'fakturanr',
- 'Gnr/Bnr-seksjon' => 'gid',
- 'Konto' => 'spbudact_code',
- 'Objekt' => 'dima', //objectclass: organizationalPerson
- 'DimB' => 'dimb',
- 'KID' => 'kidnr',
- 'MVA' => 'mvakode',
- 'Tjeneste'=> 'kostra_id',
- 'Belop [kr]' => 'belop',
- 'Referanse' => 'referanse',
- 'BOEI Gateadresse' => 'boei_gateadresse',
- 'Saksbehandler' =>'saksbehandlerid'
- );
-
- var $header =
array('Bilagsnr','Fakturanr','Gnr/Bnr-seksjon','Konto','Objekt','DimB','KID','MVA','Tjeneste','Belop
[kr]','Referanse','Saksbehandler');
-
- function import_conv()
- {
- $this->soXport =
CreateObject('property.soXport');
- $this->invoice =
CreateObject('property.boinvoice');
- $this->dateformat =
$GLOBALS['phpgw']->db->date_format();
- $this->datetimeformat =
$GLOBALS['phpgw']->db->datetime_format();
- }
-
- function import($invoice_common,$download)
- {
- $tsvfile = $invoice_common['tsvfile'];
- $bilagsnr = $this->invoice->next_bilagsnr();
-
- $buffer = array();
-
- set_time_limit(300);
-
- $reader = new XMLReader();
- $reader->open($tsvfile);
-
- $i = 0;
- while ($reader->read())
- {
- if ($reader->nodeType == XMLREADER::ELEMENT &&
$reader->localName == 'Invoice')
- {
- //print $reader->readOuterXML() . "\n";
- $xml = new DOMDocument('1.0', 'utf-8');
- $xml->formatOutput = true;
- $domnode = $reader->expand();
- $xml->appendChild($domnode);
- unset($domnode);
- $fakturanr =
$xml->getElementsByTagName('InvoiceNo')->item(0)->nodeValue;
- $fakturadato =
date($this->dateformat,strtotime($xml->getElementsByTagName('InvoiceDate')->item(0)->nodeValue));
- $forfallsdato =
date($this->dateformat,strtotime($xml->getElementsByTagName('DueDate')->item(0)->nodeValue));
- $periode =
date('Ym',strtotime($xml->getElementsByTagName('InvoiceDate')->item(0)->nodeValue));
-
- $Gnr =
$xml->getElementsByTagName('Text1')->item(0)->nodeValue;
- $Bnr =
$xml->getElementsByTagName('Text2')->item(0)->nodeValue;
- $sekjonnr =
$xml->getElementsByTagName('Text4')->item(0)->nodeValue;
- $belop =
$xml->getElementsByTagName('TotalInclTax')->item(0)->nodeValue;
- $kidnr =
$xml->getElementsByTagName('BacsId')->item(0)->nodeValue;
- $item_id = '1201' .
$xml->getElementsByTagName('HeaderText')->item(0)->nodeValue;
-
- $Link1 =
$xml->getElementsByTagName('Link1')->item(0)->nodeValue;
- $TextLink1 =
$xml->getElementsByTagName('TextLink1')->item(0)->nodeValue;
-
- $ShipTo =
$xml->getElementsByTagName('ShipTo')->item(0);
- $xpath = new DOMXpath($xml);
- $address =
$xpath->query("AddressInfo/Address", $ShipTo)->item(0)->nodeValue;
-
- $details =
$xml->getElementsByTagName('Details');
-
- $Products =
$xpath->query("Detail/Products", $details->item(0));
-
- $length = $Products->length;
- $merknad = '';
- for($j=0; $j<$length; $j++)
- {
-
- $merknad .=
$xpath->query("SellerProductDescr", $Products->item($j))->item(0)->nodeValue .
"\n";
- $merknad .=
$xpath->query("UnitCode", $Products->item($j))->item(0)->nodeValue . "\t";
- $merknad .=
$xpath->query("Quantity", $Products->item($j))->item(0)->nodeValue . "\t";
- $merknad .=
$xpath->query("Price", $Products->item($j))->item(0)->nodeValue . "\n";
-
- $Info =
$xpath->query("ProductSpecification/Info", $Products->item($j));
- for($k=0; $k<($Info->length-1);
$k++)
- {
- $merknad .=
trim($Info->item($k)->nodeValue) . "\n";
-
- }
-
- }
- $merknad .= "\n" . $TextLink1;
- $merknad .= "\n" . $Link1;
- unset($xml);
- unset($xpath);
-// print_r($merknad);
-
- if( $invoice_common['art'] == 2 ) //
kreditnota
- {
- $belop = -1 * abs($belop);
- }
-
- $buffer[$i]['fakturanr'] = $fakturanr;
- $buffer[$i]['periode'] = $periode;
- $buffer[$i]['forfallsdato'] =
$forfallsdato;
- $buffer[$i]['fakturadato'] =
$fakturadato;
- $buffer[$i]['belop'] = $belop;
- $buffer[$i]['godkjentbelop'] = $belop;
-
- $buffer[$i]['kidnr'] = $kidnr;
- $buffer[$i]['gid'] =
$Gnr.'/'.$Bnr.'-'.$sekjonnr;
- $buffer[$i]['bilagsnr'] = $bilagsnr;
-
- if(isset($invoice_common['dim_b']) &&
$invoice_common['dim_b'])
- {
- $buffer[$i]['dimb'] =
$invoice_common['dim_b'];
- }
- else
- {
- $buffer[$i]['dimb'] =
$this->dimb;
- }
-
- $buffer[$i]['item_type'] = 1;
- $buffer[$i]['item_id'] = $item_id;
-
- //Finn dima fra Boei
- $gabinfo =
$this->soXport->gabnr_to_objekt($Gnr,$Bnr,$sekjonnr);
- $buffer[$i]['dima'] = $gabinfo['dima'];
- $buffer[$i]['loc1'] = $gabinfo['loc1'];
- $buffer[$i]['mvakode'] = $this->mvakode;
-
- if($gabinfo['loc1'] &&
(isset($invoice_common['auto_tax']) && $invoice_common['auto_tax']))
- {
-
$mvakode=$this->soXport->auto_tax($gabinfo['loc1']);
-
- if($mvakode)
- {
- $buffer[$i]['mvakode']
= $mvakode;
- }
- }
-
- if(isset($invoice_common['auto_tax'])
&& $invoice_common['auto_tax'])
- {
- $buffer[$i]['mvakode'] =
$this->soXport->tax_b_account_override($buffer[$i]['mvakode']
,$this->spbudact_code);
- $buffer[$i]['mvakode'] =
$this->soXport->tax_vendor_override($buffer[$i]['mvakode']
,$invoice_common['vendor_id']);
- }
-
- $buffer[$i]['kostra_id'] =
$this->soXport->get_kostra_id($gabinfo['loc1']);
-
- //finn boei gateadresse for kontroll
-
$boei_gateadresse=$this->soXport->dima_to_address($gabinfo['dima']);
- $buffer[$i]['boei_gateadresse'] =
$boei_gateadresse;
-
- $buffer[$i]['referanse'] = $address;
-
- //FIXME - hardcoded for now
- switch($gabinfo['district_id'])
- {
- case '1':
- $saksbehandlerid =
'ho1330';
- break;
- case '2':
- $saksbehandlerid =
'ef584';
- break;
- case '3':
- $saksbehandlerid =
'shl5631';
- break;
- default:
- $saksbehandlerid =
$invoice_common['supervisor'];
- }
-
- $buffer[$i]['merknad'] = 'Kemner adr:
'.$address."\r\n".'BOEI adr: '.$boei_gateadresse."\r\n" .$merknad;
- $buffer[$i]['splitt'] = $this->splitt;
- $buffer[$i]['kildeid'] = $this->kildeid;
- $buffer[$i]['spbudact_code'] =
$this->spbudact_code;
- $buffer[$i]['typeid'] =
$invoice_common['type'];
- $buffer[$i]['regtid'] =
date($this->datetimeformat);
- $buffer[$i]['artid'] =
$invoice_common['art'];
- $buffer[$i]['spvend_code'] =
$invoice_common['vendor_id'];
- $buffer[$i]['oppsynsmannid'] =
$invoice_common['janitor'];
- $buffer[$i]['saksbehandlerid'] =
$saksbehandlerid;
- $buffer[$i]['budsjettansvarligid'] =
$invoice_common['budget_responsible'];
-//_debug_array($bilagsnr);
- $bilagsnr++;
- $i++;
- }
- }
- $reader->close();
-
- if(!$download)
- {
- $buffer =
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
- }
-
- return $buffer;
- }
-
- function import_end_file($buffer,$bilagsnr)
- {
- $num = $this->soXport->add($buffer);
- $receipt['message'][]= array('msg' =>
lang('Successfully imported %1 records into your invoice register.',$num).'
'.lang('ID').': '. $bilagsnr);
- return $receipt;
- }
- }
Deleted:
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Service
===================================================================
--- branches/Version-1_0-branch/property/inc/import/default/Import_fra_Service
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/property/inc/import/default/Import_fra_Service
2014-02-11 20:00:19 UTC (rev 11676)
@@ -1,287 +0,0 @@
-<?php
- /**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package property
- * @subpackage import
- * @version $Id: Import_fra_Service,v 1.19 2007/03/18 16:33:16 sigurdne
Exp $
- */
-
- /**
- * Description
- * @package property
- */
-
- class import_conv
- {
- var $currentrecord = array(); //used for buffering to allow uid
lines to go first
- var $id = -1;
- var $kildeid=1;
- var $splitt=0;
- var $type = 'csv';
- var $header_count = 18;
- var $soXport;
- var $invoice;
-
- var $import = array(
- 'Bestilling' => 'pmwrkord_code',
- 'Fakt. Nr' => 'fakturanr',
- 'Konto' => 'spbudact_code',
- 'Objekt' => 'dima',
- 'Fag/Timer/Matr' => 'dimd',
- 'MVA' => 'mvakode',
- 'Tjeneste'=> 'kostra_id',
- 'Belop [kr]' => 'belop'
- );
-
- var $header = array('Bestilling','Fakt.
Nr','Konto','Objekt','Fag/Timer/Matr','MVA','Belop [kr]');
-
- function import_conv()
- {
- $this->db =
clone($GLOBALS['phpgw']->db);
- $this->soXport =
CreateObject('property.soXport');
- $this->invoice =
CreateObject('property.boinvoice');
- $this->bocommon =
CreateObject('property.bocommon');
- $this->dateformat =
$GLOBALS['phpgw']->db->date_format();
- $this->datetimeformat =
$GLOBALS['phpgw']->db->datetime_format();
- $this->next_bilagsnr =
$this->invoice->next_bilagsnr();
- }
-
- function import($invoice_common,$download)
- {
- $tsvfile = $invoice_common['tsvfile'];
- $conv_type = $invoice_common['conv_type'];
- $buffer = array();
- $buffer = $this->import_start_file($buffer);
- $fp = fopen($tsvfile,'r');
-
- for ($i = 1; $i < $this->header_count &&
fgetcsv($fp,8000,';'); ++$i);
-
- while ($data = fgetcsv($fp,8000,';'))
- {
- $num = count($data);
- $buffer = $this->import_start_record($buffer);
- for ($c=0; $c<$num; $c++ )
- {
- //Send name/value pairs along with the
buffer
- if ($this->import[$this->header[$c]] !=
'')
- {
- $buffer =
$this->import_new_attrib($buffer,
$this->import[$this->header[$c]],$data[$c],$invoice_common);
- }
- }
- if($data[1] && $data[6]) // fakturanr og beløp
- {
- ++$this->id;
- $buffer =
$this->import_end_record($buffer,$invoice_common);
- }
- }
- fclose($fp);
-
- if(!$download)
- {
- $buffer =
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
- }
-
- $this->header = array('Bestilling','Fakt.
Nr','Konto','Objekt','Fag/Timer/Matr','MVA','Tjeneste','Belop [kr]');
-
- return $buffer;
- }
-
-
- function import_start_file($buffer)
- {
- return $buffer;
- }
-
- function import_start_record($buffer)
- {
- $this->currentrecord = array();
- return $buffer;
- }
-
- function import_new_attrib($buffer,$name,$value,$invoice_common)
- {
- $value = $this->bocommon->ascii2utf(trim($value));
- $value =
str_replace(array('\n','\r'),array('<BR>',''),$value);
-
- $this->currentrecord += array($name => $value);
-
- return $buffer;
- }
-
- function import_end_record($buffer,$invoice_common)
- {
- $buffer[$this->id] = array();
-
- foreach ($this->currentrecord as $name => $value)
- {
- $invoice_date =
date($this->dateformat,mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear']));
-
- if($invoice_common['num_days'])
- {
- $payment_date =
date($this->dateformat,mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear'])+(86400*$invoice_common['num_days']));
- }
- else
- {
- $payment_date =
date($this->dateformat,mktime(2,0,0,$invoice_common['emonth'],$invoice_common['eday'],$invoice_common['eyear']));
- }
-
- if($name=='belop')
- {
- $value = str_replace('kr','',$value);
- $value = str_replace(' ','',$value);
- $value = str_replace(',','.',$value);
-
- if( $invoice_common['art'] == 2 ) //
kreditnota
- {
- $value = -1 * abs($value);
- }
-
- $godkjentbelop = $value;
- }
- if($name=='pmwrkord_code')
- {
-
if(!$this->soXport->check_order(intval($value)))
- {
- $value='';
- }
- else
- {
-
$buffer[$this->id]['project_id'] = $this->soXport->get_project(intval($value));
- }
- }
- if($name=='spbudact_code')
- {
- $value =
$this->check_spbudact_code($value);
- }
-
- if($name=='fakturanr')
- {
- if($invoice_common['invoice_num'])
- {
-
$value=$invoice_common['invoice_num'];
- }
- }
-
- if($name=='dima')
- {
- $value = $this->check_dima($value);
- $buffer[$this->id]['loc1'] =
$loc1=substr($value,0,4);
- }
-
- if($name=='mvakode')
- {
- if( $invoice_common['auto_tax'])
- {
- $value =
(int)$this->soXport->auto_tax($buffer[$this->id]['loc1']);
- }
- else
- {
- $value = (int) $value;
- }
- }
-
- $buffer[$this->id][$name] = $value;
- $buffer[$this->id]['bilagsnr'] =
$this->next_bilagsnr;
- $buffer[$this->id]['splitt'] = $this->splitt;
- $buffer[$this->id]['kildeid'] = $this->kildeid;
- $buffer[$this->id]['kidnr'] =
$invoice_common['kid_nr'];
- $buffer[$this->id]['typeid'] =
$invoice_common['type'];
- $buffer[$this->id]['fakturadato'] =
$invoice_date;
- $buffer[$this->id]['forfallsdato'] =
$payment_date;
- $buffer[$this->id]['periode'] =
$invoice_common['syear'] . sprintf("%02d",$invoice_common['smonth']);
- $buffer[$this->id]['regtid'] =
date($this->datetimeformat);
- $buffer[$this->id]['artid'] =
$invoice_common['art'];
- $buffer[$this->id]['godkjentbelop'] =
$godkjentbelop;
- $buffer[$this->id]['spvend_code'] =
$invoice_common['vendor_id'];
- $buffer[$this->id]['dimb'] =
$invoice_common['dim_b'];
- $buffer[$this->id]['oppsynsmannid'] =
$invoice_common['janitor'];
- $buffer[$this->id]['saksbehandlerid'] =
$invoice_common['supervisor'];
- $buffer[$this->id]['budsjettansvarligid'] =
$invoice_common['budget_responsible'];
-
- if($invoice_common['auto_tax'])
- {
- $buffer[$this->id]['mvakode'] =
$this->soXport->tax_b_account_override($buffer[$this->id]['mvakode']
,$buffer[$this->id]['spbudact_code']);
- $buffer[$this->id]['mvakode'] =
$this->soXport->tax_vendor_override($buffer[$this->id]['mvakode']
,$buffer[$this->id]['spvend_code']);
- }
- $buffer[$this->id]['kostra_id'] =
$this->soXport->get_kostra_id($buffer[$this->id]['loc1']);
- }
-
- return $buffer;
- }
-
- function check_spbudact_code($id)
- {
- $b_account='';
- $this->db->query("select id from fm_b_account where
id='$id'");
- $this->db->next_record();
- if ($this->db->f('id'))
- {
- $b_account = $this->db->f('id');
- }
- else
- {
- $this->db->query("select id from
fm_b_account_convert where old_id='$id'");
- $this->db->next_record();
- $b_account = $this->db->f('id');
- }
-
- return $b_account;
- }
-
- function check_dima($id)
- {
- $loc1=substr($id,0,4);
- $loc2=substr($id,4,2);
-
- $this->db->query("select loc1 from fm_location1 where
loc1='$loc1' AND ((fm_location1.category <> 99) OR (fm_location1.category IS
NULL))");
- $this->db->next_record();
- if ($this->db->f('loc1'))
- {
- $dima = $this->db->f('loc1');
-
- if ($loc2)
- {
- $this->db->query("select location_code
from fm_location2 where loc1='$loc1' AND loc2='$loc2' AND
((fm_location2.category <> 99) OR (fm_location2.category IS NULL))");
- $this->db->next_record();
- if ($this->db->f('location_code'))
- {
- $dima =
str_replace('-','',$this->db->f('location_code'));
- }
- else
- {
- unset($dima);
- }
- }
- }
-
- return $dima;
- }
-
- function import_end_file($buffer,$bilagsnr)
- {
- $num = $this->soXport->add($buffer);
- $receipt['message'][]= array('msg' =>
lang('Successfully imported %1 records into your invoice register.',$num).'
'.lang('ID').': '. $bilagsnr);
- return $receipt;
- }
- }
Modified:
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Service_EBF
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Service_EBF
2014-02-11 19:47:29 UTC (rev 11675)
+++
branches/Version-1_0-branch/property/inc/import/default/Import_fra_Service_EBF
2014-02-11 20:00:19 UTC (rev 11676)
@@ -124,6 +124,8 @@
function import_end_record($buffer,$invoice_common)
{
+ static $workorders = array();
+
$buffer[$this->id] = array();
foreach ($this->currentrecord as $name => $value)
@@ -141,26 +143,33 @@
$buffer[$this->id]['godkjentbelop'] =
$value;
}
+
if($name=='pmwrkord_code')
{
-
if(!$this->soXport->check_order((int)$value))
+ if(!$workorder =
$workorders[(int)$value]['order'])
{
- $value='';
+
if(!$this->soXport->check_order((int)$value))
+ {
+
$workorders[(int)$value]['order']['cat_id'] = '';
+
$workorders[(int)$value]['order']['ecodimb'] = '';
+
$workorders[(int)$value]['project_id'] = '';
+ }
+ else
+ {
+
$workorders[(int)$value]['order'] =
execMethod('property.soworkorder.read_single', (int)$value);
+
$workorders[(int)$value]['project_id'] =
$this->soXport->get_project((int)$value);//Agresso prosjekt
+ }
}
- else
- {
- $workorder =
execMethod('property.soworkorder.read_single', (int)$value);
-
$buffer[$this->id]['project_id'] =
$this->soXport->get_project((int)$value);//Agresso prosjekt
- $buffer[$this->id]['dime']
= $workorder['cat_id']; // Dim 6
- $buffer[$this->id]['dimb']
= $workorder['ecodimb']; // Ansvarssted
- }
+
+ $buffer[$this->id]['project_id'] =
$workorders[(int)$value]['project_id'];//Agresso prosjekt
+ $buffer[$this->id]['dime'] =
$workorders[(int)$value]['order']['cat_id']; // Dim 6
+ $buffer[$this->id]['dimb'] =
$workorders[(int)$value]['order']['ecodimb']; // Ansvarssted
+
}
if($name=='spbudact_code')
{
continue;
- // $value =
$this->check_spbudact_code($value);
-
}
if($name=='dima')
@@ -213,10 +222,17 @@
$buffer[$this->id]['fakturadato'] = $invoice_date;
$buffer[$this->id]['forfallsdato'] = $payment_date;
-
if($workorder)
{
- $buffer[$this->id]['spbudact_code'] =
$workorder['b_account_id'];
+
if($this->check_old_spbudact_code($workorder['b_account_id'])
+ {
+ $buffer[$this->id]['spbudact_code'] =
'123014';
+ $buffer[$this->id]['dime'] =
(int)substr($workorder['b_account_id'],-4); // Dim 6
+ }
+ else
+ {
+ $buffer[$this->id]['spbudact_code'] =
$workorder['b_account_id'];
+ }
}
else
{
@@ -233,7 +249,7 @@
if(!isset($buffer[$this->id]['fakturanr']) ||
!$buffer[$this->id]['fakturanr']) // fakturanr
{
- $buffer[$this->id]['dimb'] =
$invoice_common['invoice_num'];
+ $buffer[$this->id]['fakturanr'] =
$invoice_common['invoice_num'];
}
if(!isset($buffer[$this->id]['dimb']) ||
!$buffer[$this->id]['dimb']) // Ansvarssted
@@ -245,7 +261,7 @@
return $buffer;
}
- function check_spbudact_code($id)
+ function check_old_spbudact_code($id)
{
$b_account='';
$this->db->query("select id from fm_b_account where
id='$id'");
Modified: branches/Version-1_0-branch/rental/inc/class.sobilling_info.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.sobilling_info.inc.php
2014-02-11 19:47:29 UTC (rev 11675)
+++ branches/Version-1_0-branch/rental/inc/class.sobilling_info.inc.php
2014-02-11 20:00:19 UTC (rev 11676)
@@ -64,7 +64,7 @@
$tables = "rental_billing_info";
$joins = '';
- var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}");
+// var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}");
return "SELECT {$cols} FROM {$tables} {$joins} WHERE
{$condition} {$order}";
}
@@ -166,4 +166,4 @@
}
}
-?>
\ No newline at end of file
+?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11676] Merge 11660:11675 from trunk,
Sigurd Nes <=