fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [11636] Merge 11633:11635 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [11636] Merge 11633:11635 from trunk
Date: Mon, 27 Jan 2014 18:47:33 +0000

Revision: 11636
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11636
Author:   sigurdne
Date:     2014-01-27 18:47:33 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
Merge 11633:11635 from trunk

Modified Paths:
--------------
    
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/property/inc/class.bobudget.inc.php
    branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
    branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
    branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
    branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js

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
   + 
/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

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-01-27 18:44:57 UTC (rev 11635)
+++ 
branches/Version-1_0-branch/phpgwapi/inc/class.vfs_fileoperation_braArkiv.inc.php
   2014-01-27 18:47:33 UTC (rev 11636)
@@ -26,34 +26,127 @@
 
        class phpgwapi_vfs_fileoperation_braArkiv
        {
+               private $Services;
+               private $secKey;
+               private $db;
+               private $meta_types = array ('journal', 'journal-deleted');
+
                public function __construct()
                {
+                       $this->db = & $GLOBALS['phpgw']->db;
+                       $location_id            = 
$GLOBALS['phpgw']->locations->get_id('phpgwapi', 'vfs_braArkiv');
 
+                       $c      = CreateObject('admin.soconfig',$location_id);
+
+                       $section = 'webservice';
+                       $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'];
+
+                       if(!$location_url || !$braarkiv_pass || !$braarkiv_pass)
+                       {
+                               throw new Exception('braArkiv is not 
configured');
+                       }
+
+                       $options=array();
+                       $options['soap_version']        = SOAP_1_2;
+                       $options['location']            = $location_url;
+                       $options['uri']                         = $location_url;
+                       $options['trace']                       = false;
+                       $options['encoding']            = 'UTF-8';
+
+                       $wdsl = "{$location_url}?WSDL";
+                       $Services = new Services($wdsl, $options);
+                       $Login = new Login();
+                       $Login->userName = $braarkiv_user;
+                       $Login->password = $braarkiv_pass;
+                       $LoginResponse = $Services->Login($Login);
+                       $secKey = $LoginResponse->LoginResult;
+                       $this->Services = $Services;
+                       $this->secKey = $secKey;
                }
 
-               public function filesize($path_parts)
+               private function get_file_id($p)
                {
-                       $path = $path_parts->real_full_path;
-                       return filesize($path);
+                       $sql = "SELECT external_id FROM phpgw_vfs WHERE  
directory='{$p->fake_leading_dirs_clean}' AND name='{$p->fake_name_clean}'"
+                               . " AND ((mime_type != 'journal' AND mime_type 
!= 'journal-deleted') OR mime_type IS NULL)";  
+                       $this->db->query($sql, __LINE__, __FILE__);
+                       $this->db->next_record();
+                       return $this->db->f('external_id');
                }
 
-               public function read($path_parts)
+               public function filesize($p)
                {
-                       $path = $path_parts->real_full_path;
-                       $filesize = filesize($path);
-                       $contents = false;
-                       if( $filesize  > 0 && $fp = fopen($path, 'rb'))
+                       $sql = "SELECT size FROM phpgw_vfs WHERE  
directory='{$p->fake_leading_dirs_clean}' AND name='{$p->fake_name_clean}'"
+                               . " AND ((mime_type != 'journal' AND mime_type 
!= 'journal-deleted') OR mime_type IS NULL)"
+                               . " ORDER BY file_id ASC";//Get the latest 
version.
+                       $this->db->query($sql, __LINE__, __FILE__);
+                       $this->db->next_record();
+
+                       return $this->db->f('size');
+               }
+
+               public function read($p)
+               {
+                       $fileid = $this->get_file_id($p);
+                       $file = null;
+
+                       if($fileid)
                        {
-                               $contents = fread($fp, $filesize);
-                               fclose ($fp);
+                               $getAvailableFileVariants = new 
getAvailableFileVariants();
+                               $getAvailableFileVariants->secKey = 
$this->secKey;
+                               $getAvailableFileVariants->documentId = $fileid;
+               
+                               $getAvailableFileVariantsResponse = 
$this->Services->getAvailableFileVariants($getAvailableFileVariants);
+
+                               $getFileAsByteArray = new getFileAsByteArray();
+                               $getFileAsByteArray->secKey = $secKey;
+                               $getFileAsByteArray->documentId = $fileid;
+                               $getFileAsByteArray->variant = 
'Org';//'PDFJPG80';
+                               $getFileAsByteArray->versjon = 1;
+               
+                               $getFileAsByteArrayResponse = 
$this->Services->getFileAsByteArray($getFileAsByteArray);
+               
+                               $getFileAsByteArrayResult = 
$getFileAsByteArrayResponse->getFileAsByteArrayResult;
+
+                               if($getFileAsByteArrayResult)
+                               {
+                                       $file = 
base64_decode($getFileAsByteArrayResult);
+                               }
                        }
-                       return $contents;
+
+                       return $file;
                }
 
                //not relevant to braArkiv
                public function copy($from, $to)
                {
                        return copy($from->real_full_path, $to->real_full_path);
+
+/*
+// Initierer en ny overføring.
+string fileid = srv.fileTransferSendChunkedInit(secKey, "20000001",
+"testfil.pdf");
+System.IO.FileStream inFile;
+inFile = new FileStream(@"C:\testfil.pdf", FileMode.Open,
+FileAccess.Read);
+// Definerer en bufferstørrelse/pakkestørrelse på ca 1mb.
+Byte[] buffer = new Byte[1048576];
+int length;
+// Løkke som sender filen i pakker.
+while(((length = inFile.Read(buffer, 0, buffer.Length)) > 0))
+{
+string base64str = System.Convert.ToBase64String(buffer, 0, length);
+srv.fileTransferSendChunk(secKey, fileid, base64str);
+}
+// Avslutter overføringen.
+srv.fileTransferSendChunkedEnd(secKey, fileid);
+
+*/
+
+
+
+
                }
 
 
@@ -70,9 +163,40 @@
                }
 
 
-               public function touch($path_parts)
+               /*
+               * Create a document
+               * @return integer.  The document_id
+               */
+               public function touch($p)
                {
-                       return @touch($path_parts->real_full_path);
+                       $document = new Document();
+                       $document->BaseClassName = "Library";
+                       $document->ClassName = "Ebook";
+
+                       $attributter = array();
+                       $att1 = new Attribute();
+                       $att1->AttribType = new 
braArkivAttributeType('braArkivString'); ∕∕FIXME
+                       $att1->Name = "Tittel";
+                       $att1->Value = array("Testtittel");
+                       $attributter[] = $att1;
+
+                       $att2 = new Attribute();
+                       $att2->AttribType = new 
braArkivAttributeType('braArkivDate'); ∕∕FIXME
+                       $att2->Name = "CreatedDate";
+                       $att2->Value = array(date('Y-m-d'));
+                       $attributter[] = $att2;
+                       
+                       $document->Attributes = $attributter;
+                       
+                       $createDocument = new createDocument();
+                       $createDocument->secKey = $this->secKey;
+                       $createDocument->secKey = false;
+                       $createDocument->secKey = $document;
+
+                       $createDocumentResponse = 
$this->Services->createDocument($createDocument);
+                       $document_id =  
$createDocumentResponse->createDocumentResult;
+                       return $document_id;
+
                }
 
                public function rename($from, $to)
@@ -124,6 +248,2502 @@
                        return mkdir($path_parts->real_full_path, 0770);
                }
 
+       }
 
+       /**
+        * soap client for http://geomatikk.no/ braArkiv
+        * this code is generated by the 
http://code.google.com/p/wsdl2php-interpreter/ 
+        *
+        * @package phpgwapi
+        * @subpackage vfs
+        */
 
+       if ( !class_exists( "Login" ) )
+       {
+
+               /**
+                * Login
+                */
+               class Login
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $userName;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $password;
+               }
+
        }
+
+       if ( !class_exists( "LoginResponse" ) )
+       {
+
+               /**
+                * LoginResponse
+                */
+               class LoginResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $LoginResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "Logout" ) )
+       {
+
+               /**
+                * Logout
+                */
+               class Logout
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+               }
+
+       }
+
+       if ( !class_exists( "LogoutResponse" ) )
+       {
+
+               /**
+                * LogoutResponse
+                */
+               class LogoutResponse
+               {
+
+               }
+
+       }
+
+       if ( !class_exists( "getProductionLines" ) )
+       {
+
+               /**
+                * getProductionLines
+                */
+               class getProductionLines
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $seckey;
+
+               }
+
+       }
+
+       if ( !class_exists( "getProductionLinesResponse" ) )
+       {
+
+               /**
+                * getProductionLinesResponse
+                */
+               class getProductionLinesResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfProductionLine
+                        */
+                       public $getProductionLinesResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "ProductionLine" ) )
+       {
+
+               /**
+                * ProductionLine
+                */
+               class ProductionLine
+               {
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $ProductionLineID;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Name;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $Enabled;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $Default;
+
+               }
+
+       }
+
+       if ( !class_exists( "getDocumentSplitTypes" ) )
+       {
+
+               /**
+                * getDocumentSplitTypes
+                */
+               class getDocumentSplitTypes
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $seckey;
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $docClassID;
+
+               }
+
+       }
+
+       if ( !class_exists( "getDocumentSplitTypesResponse" ) )
+       {
+
+               /**
+                * getDocumentSplitTypesResponse
+                */
+               class getDocumentSplitTypesResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfDocumentSplitType
+                        */
+                       public $getDocumentSplitTypesResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "DocumentSplitType" ) )
+       {
+
+               /**
+                * DocumentSplitType
+                */
+               class DocumentSplitType
+               {
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $DocSplitTypeID;
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $DocClassID;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $IsConcatDocument;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Name;
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $SplitAttributeID;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $Active;
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $NewDocSplitTypeID;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $Default;
+
+               }
+
+       }
+
+       if ( !class_exists( "GetClasses" ) )
+       {
+
+               /**
+                * GetClasses
+                */
+               class GetClasses
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $userName;
+
+               }
+
+       }
+
+       if ( !class_exists( "GetClassesResponse" ) )
+       {
+
+               /**
+                * GetClassesResponse
+                */
+               class GetClassesResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var anyType
+                        */
+                       public $GetClassesResult;
+
+                       /**
+                        * @access public
+                        * @var sschema
+                        */
+                       public $schema;
+
+               }
+
+       }
+
+       if ( !class_exists( "GetClassesResult" ) )
+       {
+
+               /**
+                * GetClassesResult
+                */
+               class GetClassesResult
+               {
+
+                       /**
+                        * @access public
+                        * @var sschema
+                        */
+                       public $schema;
+
+               }
+
+       }
+
+       if ( !class_exists( "getAvailableFileVariants" ) )
+       {
+
+               /**
+                * getAvailableFileVariants
+                */
+               class getAvailableFileVariants
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+               }
+
+       }
+
+       if ( !class_exists( "getAvailableFileVariantsResponse" ) )
+       {
+
+               /**
+                * getAvailableFileVariantsResponse
+                */
+               class getAvailableFileVariantsResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfString
+                        */
+                       public $getAvailableFileVariantsResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "getVariantVaultID" ) )
+       {
+
+               /**
+                * getVariantVaultID
+                */
+               class getVariantVaultID
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $variantName;
+
+               }
+
+       }
+
+       if ( !class_exists( "getVariantVaultIDResponse" ) )
+       {
+
+               /**
+                * getVariantVaultIDResponse
+                */
+               class getVariantVaultIDResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $getVariantVaultIDResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "getRelativeFileURL" ) )
+       {
+
+               /**
+                * getRelativeFileURL
+                */
+               class getRelativeFileURL
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $variantName;
+
+               }
+
+       }
+
+       if ( !class_exists( "getRelativeFileURLResponse" ) )
+       {
+
+               /**
+                * getRelativeFileURLResponse
+                */
+               class getRelativeFileURLResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $getRelativeFileURLResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "getAvailableAttributes" ) )
+       {
+
+               /**
+                * getAvailableAttributes
+                */
+               class getAvailableAttributes
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $baseclassname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $classname;
+
+               }
+
+       }
+
+       if ( !class_exists( "getAvailableAttributesResponse" ) )
+       {
+
+               /**
+                * getAvailableAttributesResponse
+                */
+               class getAvailableAttributesResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfAttribute
+                        */
+                       public $getAvailableAttributesResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "Attribute" ) )
+       {
+
+               /**
+                * Attribute
+                */
+               class Attribute
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Name;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $UsesLookupValues;
+
+                       /**
+                        * @access public
+                        * @var tnsbraArkivAttributeType
+                        */
+                       public $AttribType;
+
+                       /**
+                        * @access public
+                        * @var ArrayOfAnyType
+                        */
+                       public $Value;
+
+               }
+
+       }
+
+       if ( !class_exists( "braArkivAttributeType" ) )
+       {
+
+               /**
+                * braArkivAttributeType
+                */
+               class braArkivAttributeType
+               {
+
+               }
+
+       }
+
+       if ( !class_exists( "LookupValue" ) )
+       {
+
+               /**
+                * LookupValue
+                */
+               class LookupValue
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Id;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Description;
+
+               }
+
+       }
+
+       if ( !class_exists( "Pair" ) )
+       {
+
+               /**
+                * Pair
+                */
+               class Pair
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Kode;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Beskrivelse;
+
+               }
+
+       }
+
+       if ( !class_exists( "Address" ) )
+       {
+
+               /**
+                * Address
+                */
+               class Address
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Gate;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Nummer;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Bokstav;
+
+               }
+
+       }
+
+       if ( !class_exists( "Matrikkel" ) )
+       {
+
+               /**
+                * Matrikkel
+                */
+               class Matrikkel
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $GNr;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $BNr;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $FNr;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $SNr;
+
+               }
+
+       }
+
+       if ( !class_exists( "getLookupValues" ) )
+       {
+
+               /**
+                * getLookupValues
+                */
+               class getLookupValues
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $baseclassname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $classname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $attribname;
+
+               }
+
+       }
+
+       if ( !class_exists( "getLookupValuesResponse" ) )
+       {
+
+               /**
+                * getLookupValuesResponse
+                */
+               class getLookupValuesResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfLookupValue
+                        */
+                       public $getLookupValuesResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "searchDocument" ) )
+       {
+
+               /**
+                * searchDocument
+                */
+               class searchDocument
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $baseclassname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $classname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $where;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $maxhits;
+
+               }
+
+       }
+
+       if ( !class_exists( "searchDocumentResponse" ) )
+       {
+
+               /**
+                * searchDocumentResponse
+                */
+               class searchDocumentResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfString
+                        */
+                       public $searchDocumentResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "createDocument" ) )
+       {
+
+               /**
+                * createDocument
+                */
+               class createDocument
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $assignDocKey;
+
+                       /**
+                        * @access public
+                        * @var Document
+                        */
+                       public $doc;
+
+               }
+
+       }
+
+       if ( !class_exists( "Document" ) )
+       {
+
+               /**
+                * Document
+                */
+               class Document
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfAttribute
+                        */
+                       public $Attributes;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $ID;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $BFDocKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $BFNoSheets;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $BFDoubleSided;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $BFSeparateKeySheet;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $BBRegTime;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $Name;
+
+                       /**
+                        * @access public
+                        * @var sboolean
+                        */
+                       public $Classified;
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $Priority;
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $ProductionLineID;
+
+                       /**
+                        * @access public
+                        * @var sint
+                        */
+                       public $DocSplitTypeID;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $ClassName;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $BaseClassName;
+
+               }
+
+       }
+
+       if ( !class_exists( "createDocumentResponse" ) )
+       {
+
+               /**
+                * createDocumentResponse
+                */
+               class createDocumentResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var Document
+                        */
+                       public $createDocumentResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "getDocument" ) )
+       {
+
+               /**
+                * getDocument
+                */
+               class getDocument
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+               }
+
+       }
+
+       if ( !class_exists( "getDocumentResponse" ) )
+       {
+
+               /**
+                * getDocumentResponse
+                */
+               class getDocumentResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var Document
+                        */
+                       public $getDocumentResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "getAttribute" ) )
+       {
+
+               /**
+                * getAttribute
+                */
+               class getAttribute
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $attributeName;
+
+               }
+
+       }
+
+       if ( !class_exists( "getAttributeResponse" ) )
+       {
+
+               /**
+                * getAttributeResponse
+                */
+               class getAttributeResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var Attribute
+                        */
+                       public $getAttributeResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "updateDocument" ) )
+       {
+
+               /**
+                * updateDocument
+                */
+               class updateDocument
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var Document
+                        */
+                       public $document;
+
+               }
+
+       }
+
+       if ( !class_exists( "updateDocumentResponse" ) )
+       {
+
+               /**
+                * updateDocumentResponse
+                */
+               class updateDocumentResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var Document
+                        */
+                       public $updateDocumentResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "updateAttribute" ) )
+       {
+
+               /**
+                * updateAttribute
+                */
+               class updateAttribute
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $baseclassname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $attribute;
+
+                       /**
+                        * @access public
+                        * @var ArrayOfAnyType
+                        */
+                       public $value;
+
+               }
+
+       }
+
+       if ( !class_exists( "updateAttributeResponse" ) )
+       {
+
+               /**
+                * updateAttributeResponse
+                */
+               class updateAttributeResponse
+               {
+
+               }
+
+       }
+
+       if ( !class_exists( "deleteDocument" ) )
+       {
+
+               /**
+                * deleteDocument
+                */
+               class deleteDocument
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+               }
+
+       }
+
+       if ( !class_exists( "deleteDocumentResponse" ) )
+       {
+
+               /**
+                * deleteDocumentResponse
+                */
+               class deleteDocumentResponse
+               {
+
+               }
+
+       }
+
+       if ( !class_exists( "getFileName" ) )
+       {
+
+               /**
+                * getFileName
+                */
+               class getFileName
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $variant;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $versjon;
+
+               }
+
+       }
+
+       if ( !class_exists( "getFileNameResponse" ) )
+       {
+
+               /**
+                * getFileNameResponse
+                */
+               class getFileNameResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $getFileNameResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "searchAndGetDocuments" ) )
+       {
+
+               /**
+                * searchAndGetDocuments
+                */
+               class searchAndGetDocuments
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $baseclassname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $classname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $where;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $maxhits;
+
+               }
+
+       }
+
+       if ( !class_exists( "searchAndGetDocumentsResponse" ) )
+       {
+
+               /**
+                * searchAndGetDocumentsResponse
+                */
+               class searchAndGetDocumentsResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfDocument
+                        */
+                       public $searchAndGetDocumentsResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "searchAndGetDocumentsWithVariants" ) )
+       {
+
+               /**
+                * searchAndGetDocumentsWithVariants
+                */
+               class searchAndGetDocumentsWithVariants
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $baseclassname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $classname;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $where;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $maxhits;
+
+               }
+
+       }
+
+       if ( !class_exists( "Variant" ) )
+       {
+
+               /**
+                * Variant
+                */
+               class Variant
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $FileName;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $FileExtension;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $VaultName;
+
+               }
+
+       }
+
+       if ( !class_exists( "ExtendedDocument" ) )
+       {
+
+               /**
+                * ExtendedDocument
+                */
+               class ExtendedDocument extends Document
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfVariant
+                        */
+                       public $Variants;
+
+               }
+
+       }
+
+       if ( !class_exists( "searchAndGetDocumentsWithVariantsResponse" ) )
+       {
+
+               /**
+                * searchAndGetDocumentsWithVariantsResponse
+                */
+               class searchAndGetDocumentsWithVariantsResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var ArrayOfExtendedDocument
+                        */
+                       public $searchAndGetDocumentsWithVariantsResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "putFileAsByteArray" ) )
+       {
+
+               /**
+                * putFileAsByteArray
+                */
+               class putFileAsByteArray
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $filename;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $file;
+
+               }
+
+       }
+
+       if ( !class_exists( "putFileAsByteArrayResponse" ) )
+       {
+
+               /**
+                * putFileAsByteArrayResponse
+                */
+               class putFileAsByteArrayResponse
+               {
+
+               }
+
+       }
+
+       if ( !class_exists( "getFileAsByteArray" ) )
+       {
+
+               /**
+                * getFileAsByteArray
+                */
+               class getFileAsByteArray
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $variant;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $versjon;
+
+               }
+
+       }
+
+       if ( !class_exists( "getFileAsByteArrayResponse" ) )
+       {
+
+               /**
+                * getFileAsByteArrayResponse
+                */
+               class getFileAsByteArrayResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $getFileAsByteArrayResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferSendChunk" ) )
+       {
+
+               /**
+                * fileTransferSendChunk
+                */
+               class fileTransferSendChunk
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $fileid;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $chunk;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferSendChunkResponse" ) )
+       {
+
+               /**
+                * fileTransferSendChunkResponse
+                */
+               class fileTransferSendChunkResponse
+               {
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferSendChunkedInit" ) )
+       {
+
+               /**
+                * fileTransferSendChunkedInit
+                */
+               class fileTransferSendChunkedInit
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $docid;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $filename;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferSendChunkedInitResponse" ) )
+       {
+
+               /**
+                * fileTransferSendChunkedInitResponse
+                */
+               class fileTransferSendChunkedInitResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $fileTransferSendChunkedInitResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferSendChunkedEnd" ) )
+       {
+
+               /**
+                * fileTransferSendChunkedEnd
+                */
+               class fileTransferSendChunkedEnd
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $fileid;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferSendChunkedEndResponse" ) )
+       {
+
+               /**
+                * fileTransferSendChunkedEndResponse
+                */
+               class fileTransferSendChunkedEndResponse
+               {
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferRequestChunkedInit" ) )
+       {
+
+               /**
+                * fileTransferRequestChunkedInit
+                */
+               class fileTransferRequestChunkedInit
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $documentId;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $variant;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $versjon;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferRequestChunkedInitResponse" ) )
+       {
+
+               /**
+                * fileTransferRequestChunkedInitResponse
+                */
+               class fileTransferRequestChunkedInitResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $fileTransferRequestChunkedInitResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferRequestChunk" ) )
+       {
+
+               /**
+                * fileTransferRequestChunk
+                */
+               class fileTransferRequestChunk
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $fileid;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $offset;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferRequestChunkResponse" ) )
+       {
+
+               /**
+                * fileTransferRequestChunkResponse
+                */
+               class fileTransferRequestChunkResponse
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $fileTransferRequestChunkResult;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferRequestChunkedEnd" ) )
+       {
+
+               /**
+                * fileTransferRequestChunkedEnd
+                */
+               class fileTransferRequestChunkedEnd
+               {
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $secKey;
+
+                       /**
+                        * @access public
+                        * @var sstring
+                        */
+                       public $fileid;
+
+               }
+
+       }
+
+       if ( !class_exists( "fileTransferRequestChunkedEndResponse" ) )
+       {
+
+               /**
+                * fileTransferRequestChunkedEndResponse
+                */
+               class fileTransferRequestChunkedEndResponse
+               {
+
+               }
+
+       }
+
+       if ( !class_exists( "Services" ) )
+       {
+
+               /**
+                * Services
+                * @author WSDLInterpreter
+                */
+               class Services extends SoapClient
+               {
+
+                       /**
+                        * Default class map for wsdl=>php
+                        * @access private
+                        * @var array
+                        */
+                       private static $classmap = array(
+                               "Login"                                         
                                 => "Login",
+                               "LoginResponse"                                 
                         => "LoginResponse",
+                               "Logout"                                        
                                 => "Logout",
+                               "LogoutResponse"                                
                         => "LogoutResponse",
+                               "getProductionLines"                            
                 => "getProductionLines",
+                               "getProductionLinesResponse"                    
         => "getProductionLinesResponse",
+                               "ProductionLine"                                
                         => "ProductionLine",
+                               "getDocumentSplitTypes"                         
                 => "getDocumentSplitTypes",
+                               "getDocumentSplitTypesResponse"                 
         => "getDocumentSplitTypesResponse",
+                               "DocumentSplitType"                             
                         => "DocumentSplitType",
+                               "GetClasses"                                    
                         => "GetClasses",
+                               "GetClassesResponse"                            
                 => "GetClassesResponse",
+                               "GetClassesResult"                              
                         => "GetClassesResult",
+                               "getAvailableFileVariants"                      
                 => "getAvailableFileVariants",
+                               "getAvailableFileVariantsResponse"              
         => "getAvailableFileVariantsResponse",
+                               "getVariantVaultID"                             
                         => "getVariantVaultID",
+                               "getVariantVaultIDResponse"                     
                 => "getVariantVaultIDResponse",
+                               "getRelativeFileURL"                            
                 => "getRelativeFileURL",
+                               "getRelativeFileURLResponse"                    
         => "getRelativeFileURLResponse",
+                               "getAvailableAttributes"                        
                 => "getAvailableAttributes",
+                               "getAvailableAttributesResponse"                
         => "getAvailableAttributesResponse",
+                               "Attribute"                                     
                                 => "Attribute",
+                               "braArkivAttributeType"                         
                 => "braArkivAttributeType",
+                               "LookupValue"                                   
                         => "LookupValue",
+                               "Pair"                                          
                                 => "Pair",
+                               "Address"                                       
                                 => "Address",
+                               "Matrikkel"                                     
                                 => "Matrikkel",
+                               "getLookupValues"                               
                         => "getLookupValues",
+                               "getLookupValuesResponse"                       
                 => "getLookupValuesResponse",
+                               "searchDocument"                                
                         => "searchDocument",
+                               "searchDocumentResponse"                        
                 => "searchDocumentResponse",
+                               "createDocument"                                
                         => "createDocument",
+                               "Document"                                      
                                 => "Document",
+                               "createDocumentResponse"                        
                 => "createDocumentResponse",
+                               "getDocument"                                   
                         => "getDocument",
+                               "getDocumentResponse"                           
                 => "getDocumentResponse",
+                               "getAttribute"                                  
                         => "getAttribute",
+                               "getAttributeResponse"                          
                 => "getAttributeResponse",
+                               "updateDocument"                                
                         => "updateDocument",
+                               "updateDocumentResponse"                        
                 => "updateDocumentResponse",
+                               "updateAttribute"                               
                         => "updateAttribute",
+                               "updateAttributeResponse"                       
                 => "updateAttributeResponse",
+                               "deleteDocument"                                
                         => "deleteDocument",
+                               "deleteDocumentResponse"                        
                 => "deleteDocumentResponse",
+                               "getFileName"                                   
                         => "getFileName",
+                               "getFileNameResponse"                           
                 => "getFileNameResponse",
+                               "searchAndGetDocuments"                         
                 => "searchAndGetDocuments",
+                               "searchAndGetDocumentsResponse"                 
         => "searchAndGetDocumentsResponse",
+                               "searchAndGetDocumentsWithVariants"             
         => "searchAndGetDocumentsWithVariants",
+                               "Variant"                                       
                                 => "Variant",
+                               "ExtendedDocument"                              
                         => "ExtendedDocument",
+                               "searchAndGetDocumentsWithVariantsResponse"     
 => "searchAndGetDocumentsWithVariantsResponse",
+                               "putFileAsByteArray"                            
                 => "putFileAsByteArray",
+                               "putFileAsByteArrayResponse"                    
         => "putFileAsByteArrayResponse",
+                               "getFileAsByteArray"                            
                 => "getFileAsByteArray",
+                               "getFileAsByteArrayResponse"                    
         => "getFileAsByteArrayResponse",
+                               "fileTransferSendChunk"                         
                 => "fileTransferSendChunk",
+                               "fileTransferSendChunkResponse"                 
         => "fileTransferSendChunkResponse",
+                               "fileTransferSendChunkedInit"                   
         => "fileTransferSendChunkedInit",
+                               "fileTransferSendChunkedInitResponse"           
 => "fileTransferSendChunkedInitResponse",
+                               "fileTransferSendChunkedEnd"                    
         => "fileTransferSendChunkedEnd",
+                               "fileTransferSendChunkedEndResponse"            
 => "fileTransferSendChunkedEndResponse",
+                               "fileTransferRequestChunkedInit"                
         => "fileTransferRequestChunkedInit",
+                               "fileTransferRequestChunkedInitResponse"        
 => "fileTransferRequestChunkedInitResponse",
+                               "fileTransferRequestChunk"                      
                 => "fileTransferRequestChunk",
+                               "fileTransferRequestChunkResponse"              
         => "fileTransferRequestChunkResponse",
+                               "fileTransferRequestChunkedEnd"                 
         => "fileTransferRequestChunkedEnd",
+                               "fileTransferRequestChunkedEndResponse"         
 => "fileTransferRequestChunkedEndResponse",
+                       );
+
+                       /**
+                        * Constructor using wsdl location and options array
+                        * @param string $wsdl WSDL location for this service
+                        * @param array $options Options for the SoapClient
+                        */
+                       public function __construct( $wsdl = 
"/home/sn5607/BRA_Arkiv/services.braarkiv.xml",
+                                                               $options = 
array() )
+                       {
+                               foreach ( self::$classmap as $wsdlClassName => 
$phpClassName )
+                               {
+                                       if ( !isset( 
$options['classmap'][$wsdlClassName] ) )
+                                       {
+                                               
$options['classmap'][$wsdlClassName] = $phpClassName;
+                                       }
+                               }
+                               parent::__construct( $wsdl, $options );
+                       }
+
+                       /**
+                        * Checks if an argument list matches against a valid 
argument type list
+                        * @param array $arguments The argument list to check
+                        * @param array $validParameters A list of valid 
argument types
+                        * @return boolean true if arguments match against 
validParameters
+                        * @throws Exception invalid function signature message
+                        */
+                       public function _checkArguments( $arguments, 
$validParameters )
+                       {
+                               $variables = "";
+                               foreach ( $arguments as $arg )
+                               {
+                                       $type = gettype( $arg );
+                                       if ( $type == "object" )
+                                       {
+                                               $type = get_class( $arg );
+                                       }
+                                       $variables .= "(" . $type . ")";
+                               }
+                               if ( !in_array( $variables, $validParameters ) )
+                               {
+                                       throw new Exception( "Invalid parameter 
types: " . str_replace( ")(", ", ",
+                                                                               
                                                         $variables ) );
+                               }
+                               return true;
+                       }
+
+                       /**
+                        * Service Call: Login
+                        * Parameter options:
+                        * (Login) parameters
+                        * (Login) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return LoginResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function Login( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(Login)",
+                                       "(Login)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "Login", $args );
+                       }
+
+                       /**
+                        * Service Call: Logout
+                        * Parameter options:
+                        * (Logout) parameters
+                        * (Logout) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return LogoutResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function Logout( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(Logout)",
+                                       "(Logout)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "Logout", $args );
+                       }
+
+                       /**
+                        * Service Call: getProductionLines
+                        * Parameter options:
+                        * (getProductionLines) parameters
+                        * (getProductionLines) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getProductionLinesResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getProductionLines( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getProductionLines)",
+                                       "(getProductionLines)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "getProductionLines", 
$args );
+                       }
+
+                       /**
+                        * Service Call: getDocumentSplitTypes
+                        * Parameter options:
+                        * (getDocumentSplitTypes) parameters
+                        * (getDocumentSplitTypes) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getDocumentSplitTypesResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getDocumentSplitTypes( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getDocumentSplitTypes)",
+                                       "(getDocumentSplitTypes)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"getDocumentSplitTypes", $args );
+                       }
+
+                       /**
+                        * Service Call: GetClasses
+                        * Parameter options:
+                        * (GetClasses) parameters
+                        * (GetClasses) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return GetClassesResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function GetClasses( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(GetClasses)",
+                                       "(GetClasses)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "GetClasses", $args );
+                       }
+
+                       /**
+                        * Service Call: getAvailableFileVariants
+                        * Parameter options:
+                        * (getAvailableFileVariants) parameters
+                        * (getAvailableFileVariants) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getAvailableFileVariantsResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getAvailableFileVariants( $mixed = null 
)
+                       {
+                               $validParameters = array(
+                                       "(getAvailableFileVariants)",
+                                       "(getAvailableFileVariants)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"getAvailableFileVariants", $args );
+                       }
+
+                       /**
+                        * Service Call: getVariantVaultID
+                        * Parameter options:
+                        * (getVariantVaultID) parameters
+                        * (getVariantVaultID) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getVariantVaultIDResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getVariantVaultID( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getVariantVaultID)",
+                                       "(getVariantVaultID)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "getVariantVaultID", 
$args );
+                       }
+
+                       /**
+                        * Service Call: getRelativeFileURL
+                        * Parameter options:
+                        * (getRelativeFileURL) parameters
+                        * (getRelativeFileURL) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getRelativeFileURLResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getRelativeFileURL( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getRelativeFileURL)",
+                                       "(getRelativeFileURL)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "getRelativeFileURL", 
$args );
+                       }
+
+                       /**
+                        * Service Call: getAvailableAttributes
+                        * Parameter options:
+                        * (getAvailableAttributes) parameters
+                        * (getAvailableAttributes) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getAvailableAttributesResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getAvailableAttributes( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getAvailableAttributes)",
+                                       "(getAvailableAttributes)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"getAvailableAttributes", $args );
+                       }
+
+                       /**
+                        * Service Call: getLookupValues
+                        * Parameter options:
+                        * (getLookupValues) parameters
+                        * (getLookupValues) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getLookupValuesResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getLookupValues( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getLookupValues)",
+                                       "(getLookupValues)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "getLookupValues", 
$args );
+                       }
+
+                       /**
+                        * Service Call: searchDocument
+                        * Parameter options:
+                        * (searchDocument) parameters
+                        * (searchDocument) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return searchDocumentResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function searchDocument( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(searchDocument)",
+                                       "(searchDocument)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "searchDocument", 
$args );
+                       }
+
+                       /**
+                        * Service Call: createDocument
+                        * Parameter options:
+                        * (createDocument) parameters
+                        * (createDocument) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return createDocumentResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function createDocument( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(createDocument)",
+                                       "(createDocument)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "createDocument", 
$args );
+                       }
+
+                       /**
+                        * Service Call: getDocument
+                        * Parameter options:
+                        * (getDocument) parameters
+                        * (getDocument) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getDocumentResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getDocument( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getDocument)",
+                                       "(getDocument)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "getDocument", $args 
);
+                       }
+
+                       /**
+                        * Service Call: getAttribute
+                        * Parameter options:
+                        * (getAttribute) parameters
+                        * (getAttribute) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getAttributeResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getAttribute( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getAttribute)",
+                                       "(getAttribute)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "getAttribute", $args 
);
+                       }
+
+                       /**
+                        * Service Call: updateDocument
+                        * Parameter options:
+                        * (updateDocument) parameters
+                        * (updateDocument) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return updateDocumentResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function updateDocument( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(updateDocument)",
+                                       "(updateDocument)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "updateDocument", 
$args );
+                       }
+
+                       /**
+                        * Service Call: updateAttribute
+                        * Parameter options:
+                        * (updateAttribute) parameters
+                        * (updateAttribute) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return updateAttributeResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function updateAttribute( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(updateAttribute)",
+                                       "(updateAttribute)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "updateAttribute", 
$args );
+                       }
+
+                       /**
+                        * Service Call: deleteDocument
+                        * Parameter options:
+                        * (deleteDocument) parameters
+                        * (deleteDocument) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return deleteDocumentResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function deleteDocument( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(deleteDocument)",
+                                       "(deleteDocument)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "deleteDocument", 
$args );
+                       }
+
+                       /**
+                        * Service Call: getFileName
+                        * Parameter options:
+                        * (getFileName) parameters
+                        * (getFileName) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getFileNameResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getFileName( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getFileName)",
+                                       "(getFileName)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "getFileName", $args 
);
+                       }
+
+                       /**
+                        * Service Call: searchAndGetDocuments
+                        * Parameter options:
+                        * (searchAndGetDocuments) parameters
+                        * (searchAndGetDocuments) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return searchAndGetDocumentsResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function searchAndGetDocuments( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(searchAndGetDocuments)",
+                                       "(searchAndGetDocuments)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"searchAndGetDocuments", $args );
+                       }
+
+                       /**
+                        * Service Call: searchAndGetDocumentsWithVariants
+                        * Parameter options:
+                        * (searchAndGetDocumentsWithVariants) parameters
+                        * (searchAndGetDocumentsWithVariants) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return searchAndGetDocumentsWithVariantsResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function searchAndGetDocumentsWithVariants( 
$mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(searchAndGetDocumentsWithVariants)",
+                                       "(searchAndGetDocumentsWithVariants)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"searchAndGetDocumentsWithVariants", $args );
+                       }
+
+                       /**
+                        * Service Call: putFileAsByteArray
+                        * Parameter options:
+                        * (putFileAsByteArray) parameters
+                        * (putFileAsByteArray) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return putFileAsByteArrayResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function putFileAsByteArray( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(putFileAsByteArray)",
+                                       "(putFileAsByteArray)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "putFileAsByteArray", 
$args );
+                       }
+
+                       /**
+                        * Service Call: getFileAsByteArray
+                        * Parameter options:
+                        * (getFileAsByteArray) parameters
+                        * (getFileAsByteArray) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return getFileAsByteArrayResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function getFileAsByteArray( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(getFileAsByteArray)",
+                                       "(getFileAsByteArray)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( "getFileAsByteArray", 
$args );
+                       }
+
+                       /**
+                        * Service Call: fileTransferSendChunk
+                        * Parameter options:
+                        * (fileTransferSendChunk) parameters
+                        * (fileTransferSendChunk) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return fileTransferSendChunkResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function fileTransferSendChunk( $mixed = null )
+                       {
+                               $validParameters = array(
+                                       "(fileTransferSendChunk)",
+                                       "(fileTransferSendChunk)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"fileTransferSendChunk", $args );
+                       }
+
+                       /**
+                        * Service Call: fileTransferSendChunkedInit
+                        * Parameter options:
+                        * (fileTransferSendChunkedInit) parameters
+                        * (fileTransferSendChunkedInit) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return fileTransferSendChunkedInitResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function fileTransferSendChunkedInit( $mixed = 
null )
+                       {
+                               $validParameters = array(
+                                       "(fileTransferSendChunkedInit)",
+                                       "(fileTransferSendChunkedInit)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"fileTransferSendChunkedInit", $args );
+                       }
+
+                       /**
+                        * Service Call: fileTransferSendChunkedEnd
+                        * Parameter options:
+                        * (fileTransferSendChunkedEnd) parameters
+                        * (fileTransferSendChunkedEnd) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return fileTransferSendChunkedEndResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function fileTransferSendChunkedEnd( $mixed = 
null )
+                       {
+                               $validParameters = array(
+                                       "(fileTransferSendChunkedEnd)",
+                                       "(fileTransferSendChunkedEnd)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"fileTransferSendChunkedEnd", $args );
+                       }
+
+                       /**
+                        * Service Call: fileTransferRequestChunkedInit
+                        * Parameter options:
+                        * (fileTransferRequestChunkedInit) parameters
+                        * (fileTransferRequestChunkedInit) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return fileTransferRequestChunkedInitResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function fileTransferRequestChunkedInit( $mixed 
= null )
+                       {
+                               $validParameters = array(
+                                       "(fileTransferRequestChunkedInit)",
+                                       "(fileTransferRequestChunkedInit)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"fileTransferRequestChunkedInit", $args );
+                       }
+
+                       /**
+                        * Service Call: fileTransferRequestChunk
+                        * Parameter options:
+                        * (fileTransferRequestChunk) parameters
+                        * (fileTransferRequestChunk) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return fileTransferRequestChunkResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function fileTransferRequestChunk( $mixed = null 
)
+                       {
+                               $validParameters = array(
+                                       "(fileTransferRequestChunk)",
+                                       "(fileTransferRequestChunk)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"fileTransferRequestChunk", $args );
+                       }
+
+                       /**
+                        * Service Call: fileTransferRequestChunkedEnd
+                        * Parameter options:
+                        * (fileTransferRequestChunkedEnd) parameters
+                        * (fileTransferRequestChunkedEnd) parameters
+                        * @param mixed,... See function description for 
parameter options
+                        * @return fileTransferRequestChunkedEndResponse
+                        * @throws Exception invalid function signature message
+                        */
+                       public function fileTransferRequestChunkedEnd( $mixed = 
null )
+                       {
+                               $validParameters = array(
+                                       "(fileTransferRequestChunkedEnd)",
+                                       "(fileTransferRequestChunkedEnd)",
+                               );
+                               $args = func_get_args();
+                               $this->_checkArguments( $args, $validParameters 
);
+                               return $this->__soapCall( 
"fileTransferRequestChunkedEnd", $args );
+                       }
+
+               }
+
+       }

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-01-27 18:44:57 UTC (rev 11635)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vfs_sql.inc.php      
2014-01-27 18:47:33 UTC (rev 11636)
@@ -2718,7 +2718,7 @@
                                                }
 
                                                $rarray[] = 
$this->get_real_info(array(
-                                                               'string'        
=> $p->fake_full_path . '/' . $filename,
+                                                               'string'        
=> "{$p->fake_full_path}/{$filename}",
                                                                'relatives'     
=> array(RELATIVE_NONE)
                                                        )
                                                );
@@ -2741,7 +2741,7 @@
                                while(list($num, $file_array) = each($rarray))
                                {
                                        $p2 = $this->path_parts(array(
-                                                       'string'        => 
$file_array['directory'] . '/' . $file_array['name'],
+                                                       'string'        => 
"{$file_array['directory']}/{$file_array['name']}",
                                                        'relatives'     => 
array(RELATIVE_NONE)
                                                )
                                        );

Modified: branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bobudget.inc.php     
2014-01-27 18:44:57 UTC (rev 11635)
+++ branches/Version-1_0-branch/property/inc/class.bobudget.inc.php     
2014-01-27 18:47:33 UTC (rev 11636)
@@ -49,6 +49,7 @@
                var     $sum_budget_cost                = 0;
                var     $sum_obligation_cost    = 0;
                var     $sum_actual_cost                = 0;
+               var     $sum_actual_cost_period         = 0;
                var $sum_hits                           = 0;
                var     $total_records                  = 0;
 
@@ -196,11 +197,12 @@
                                'details' => $this->details,'dimb_id' => 
$this->dimb_id, 'department' => $this->department,
                                'direction'     => $this->direction));
 
-                       $this->total_records            = 
$this->so->total_records;
-                       $this->sum_budget_cost          = 
$this->so->sum_budget_cost;
-                       $this->sum_obligation_cost      = 
$this->so->sum_obligation_cost;
-                       $this->sum_actual_cost          = 
$this->so->sum_actual_cost;
-                       $this->sum_hits                         = 
$this->so->sum_hits;
+                       $this->total_records                    = 
$this->so->total_records;
+                       $this->sum_budget_cost                  = 
$this->so->sum_budget_cost;
+                       $this->sum_obligation_cost              = 
$this->so->sum_obligation_cost;
+                       $this->sum_actual_cost                  = 
$this->so->sum_actual_cost;
+                       $this->sum_actual_cost_period   = 
$this->so->sum_actual_cost_period;
+                       $this->sum_hits                                 = 
$this->so->sum_hits;
 
                        return $obligations;
                }

Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php     
2014-01-27 18:44:57 UTC (rev 11635)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php     
2014-01-27 18:47:33 UTC (rev 11636)
@@ -34,10 +34,11 @@
 
        class property_sobudget
        {
-               var     $sum_budget_cost                = 0;
-               var     $sum_obligation_cost    = 0;
-               var     $sum_actual_cost                = 0;
-               var $sum_hits                           = 0;
+               var     $sum_budget_cost                        = 0;
+               var     $sum_obligation_cost            = 0;
+               var     $sum_actual_cost_period         = 0;
+               var     $sum_actual_cost                        = 0;
+               var $sum_hits                                   = 0;
 
                function __construct()
                {
@@ -696,48 +697,45 @@
 
                        $soworkorder = CreateObject('property.soworkorder');
 
+                       $sum_actual_cost_period = 0;
                        $sum_actual_cost = 0;
                        $actual_cost = array();
+                       $actual_cost_period = array();
                        $sum_obligation_cost = 0;
                        $obligations = array();
                        $sum_hits = 0;
 
                        $sum_hits = count($_temp_paid_info);
-
+$_periods=array();
                        foreach ($_temp_paid_info as $order_id => &$order_info)
                        {
                                $order_budget = 
$soworkorder->get_budget($order_id);
-//_debug_array($order_budget);
+
                                $_count = false;
                                foreach($order_budget as $budget)
                                {
                                        if($budget['year'] == $year)
                                        {
 
+                                               $_taxfactor             = 1 + 
($_taxcode[(int)$order_info['mva']]/100);
+                                               $_actual_cost   = 
round($budget['actual_cost']/$_taxfactor);
+
+                                               $sum_actual_cost += 
$_actual_cost;
+                                               
if($budget['actual_period']==$filter_period)
+                                               {
+                                                       
$actual_cost_period[$order_info['b_account']][$order_info['district_id']][$order_info['ecodimb']]
 += $_actual_cost;
+                                                       $sum_actual_cost_period 
+= $_actual_cost;
+                                               }
+
                                                if($budget['period'] != 
"{$year}00" && $filter_period && ((int)$filter_period) < (int)$budget['period'])
                                                {
                                                        continue;
                                                }
-/*
-$projects3[$projects2[$order_id]]['actual_cost']+= $budget['actual_cost'];
-$projects3[$projects2[$order_id]]['combined_cost']+= $budget['sum_orders'];
-$projects3[$projects2[$order_id]]['budget']+= $budget['budget'];
-$projects3[$projects2[$order_id]]['obligation']+= $budget['sum_oblications'];
-*/
-                                       //      $order_info['actual_cost']      
        = $budget['actual_cost'];
-                                       //      $order_info['combined_cost']    
= $budget['sum_orders'];
-                                       //      $order_info['budget']           
        = $budget['budget'];
-                                       //      $order_info['obligation']       
        = $budget['sum_oblications'];
 
+//$_periods[] = $budget['period'];
                                                $sum_obligation_cost += 
$budget['sum_oblications'];
                                                
$obligations[$order_info['b_account']][$order_info['district_id']][$order_info['ecodimb']]
 += $budget['sum_oblications'];
 
-                                               $_taxfactor             = 1 + 
($_taxcode[(int)$order_info['mva']]/100);
-                                               $_actual_cost   = 
round($budget['actual_cost']/$_taxfactor);
-
-//_debug_array($_test);
-
-                                               $sum_actual_cost += 
$_actual_cost;
                                                
$actual_cost[$order_info['b_account']][$order_info['district_id']][$order_info['ecodimb']]
 += $_actual_cost;
                                        }
 
@@ -751,7 +749,6 @@
                                        }
                                }
                        }
-//_debug_array($projects3);
 
 
 //                     _debug_array($obligations);
@@ -799,9 +796,9 @@
 
                        $sql = "SELECT sum(budget) as budget, 
count(fm_tts_tickets.id) as hits, fm_b_account.{$b_account_field} as 
{$b_account_field}, district_id, fm_tts_tickets.ecodimb"
                                . " FROM fm_tts_tickets"
-                               . " $this->join fm_b_account ON 
fm_tts_tickets.b_account_id = fm_b_account.id "
-                               . " $this->join fm_location1 ON 
fm_tts_tickets.loc1 = fm_location1.loc1 "
-                               . " $this->join fm_part_of_town ON 
fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id $filtermethod 
$filtermethod2 $querymethod  {$where} {$filtermethod_direction} GROUP BY 
fm_b_account.{$b_account_field},district_id,fm_tts_tickets.ecodimb";
+                               . " {$this->join} fm_b_account ON 
fm_tts_tickets.b_account_id = fm_b_account.id "
+                               . " {$this->join} fm_location1 ON 
fm_tts_tickets.loc1 = fm_location1.loc1 "
+                               . " {$this->join} fm_part_of_town ON 
fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id $filtermethod 
$filtermethod2 $querymethod  {$where} {$filtermethod_direction} GROUP BY 
fm_b_account.{$b_account_field},district_id,fm_tts_tickets.ecodimb";
 
                        //_debug_array($sql);die();
                        $this->db->query($sql . $ordermethod,__LINE__,__FILE__);
@@ -825,9 +822,9 @@
 
                        $sql = "SELECT sum(budget) as budget, 
count(fm_tts_tickets.id) as hits, fm_b_account.{$b_account_field} as 
{$b_account_field}, district_id, fm_tts_tickets.ecodimb"
                                . " FROM fm_tts_tickets"
-                               . " $this->join fm_b_account ON 
fm_tts_tickets.b_account_id = fm_b_account.id "
-                               . " $this->join fm_location1 ON 
fm_tts_tickets.loc1 = fm_location1.loc1 "
-                               . " $this->join fm_part_of_town ON 
fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id $filtermethod 
$querymethod  {$where} {$filtermethod_direction} GROUP BY 
fm_b_account.{$b_account_field},district_id,fm_tts_tickets.ecodimb";
+                               . " {$this->join} fm_b_account ON 
fm_tts_tickets.b_account_id = fm_b_account.id "
+                               . " {$this->join} fm_location1 ON 
fm_tts_tickets.loc1 = fm_location1.loc1 "
+                               . " {$this->join} fm_part_of_town ON 
fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id {$filtermethod} 
{$querymethod} {$where} {$filtermethod_direction} GROUP BY 
fm_b_account.{$b_account_field},district_id,fm_tts_tickets.ecodimb";
 
 
                        $sql = str_replace('budget', 'actual_cost', $sql);
@@ -982,13 +979,13 @@
 
 //-------start check paid service agreement-----------
 
-                       $sql = "SELECT fm_b_account.{$b_account_field} as 
{$b_account_field}, sum(fm_ecobilagoverf.godkjentbelop) as 
actual_cost,fm_s_agreement_budget.ecodimb"
-                               . " FROM fm_ecobilagoverf"
+                       $sql = "SELECT fm_b_account.{$b_account_field} as 
{$b_account_field}, sum(fm_ecobilagoverf.godkjentbelop) as 
actual_cost,fm_s_agreement_budget.ecodimb,"
+                               . " periode FROM fm_ecobilagoverf"
                                . " {$this->join} fm_b_account ON 
fm_ecobilagoverf.spbudact_code =fm_b_account.id"
                                . " {$this->join} fm_s_agreement ON 
fm_ecobilagoverf.pmwrkord_code = fm_s_agreement.id"
                                . " {$this->join} fm_s_agreement_budget ON 
fm_s_agreement.id = fm_s_agreement_budget.agreement_id"
                                . " WHERE periode >= $start_periode AND periode 
<= $end_periode AND {$filtermethod} {$where} {$filtermethod_direction}"
-                               . " GROUP BY fm_b_account.{$b_account_field}, 
ecodimb";
+                               . " GROUP BY fm_b_account.{$b_account_field}, 
ecodimb, periode";
 //_debug_array($sql);
                        $this->db->query($sql,__LINE__,__FILE__);
 
@@ -1000,6 +997,11 @@
 
                                $sum_actual_cost += $_actual_cost;
                                
$actual_cost[$_account_value][$_dummy_district][$_dimb] += $_actual_cost;
+                               
if((int)$this->db->f('periode')==(int)$filter_period)
+                               {
+                                       
$actual_cost_period[$_account_value][$_dummy_district][$_dimb] += $_actual_cost;
+                                       $sum_actual_cost_period += 
$_actual_cost;
+                               }
                                
$obligations[$_account_value][$_dummy_district][$_dimb] -= $_actual_cost;
                                $accout_info[$_account_value] = true;
                                $district[$_dummy_district] = true;
@@ -1037,13 +1039,13 @@
                                $where = 'AND';
                        }
 
-                       $sql = "SELECT fm_b_account.{$b_account_field} as 
{$b_account_field}, sum(fm_ecobilag.godkjentbelop) as 
actual_cost,fm_s_agreement_budget.ecodimb"
-                               . " FROM fm_ecobilag"
+                       $sql = "SELECT fm_b_account.{$b_account_field} as 
{$b_account_field}, sum(fm_ecobilag.godkjentbelop) as 
actual_cost,fm_s_agreement_budget.ecodimb,"
+                               . " periode FROM fm_ecobilag"
                                . " {$this->join} fm_b_account ON 
fm_ecobilag.spbudact_code =fm_b_account.id"
                                . " {$this->join} fm_s_agreement ON 
fm_ecobilag.pmwrkord_code = fm_s_agreement.id"
                                . " {$this->join} fm_s_agreement_budget ON 
fm_s_agreement.id = fm_s_agreement_budget.agreement_id"
                                . " {$filtermethod} {$where} 
{$filtermethod_direction}"
-                               . " GROUP BY fm_b_account.{$b_account_field}, 
ecodimb";
+                               . " GROUP BY fm_b_account.{$b_account_field}, 
ecodimb, periode";
 //_debug_array($sql);
                        $this->db->query($sql,__LINE__,__FILE__);
 
@@ -1054,6 +1056,11 @@
                                $_dimb = (int)$this->db->f('ecodimb');
 
                                $sum_actual_cost += $_actual_cost;
+                               
if((int)$this->db->f('periode')==(int)$filter_period)
+                               {
+                                       
$actual_cost_period[$_account_value][$_dummy_district][$_dimb] += $_actual_cost;
+                                       $sum_actual_cost_period += 
$_actual_cost;
+                               }
                                
$actual_cost[$_account_value][$_dummy_district][$_dimb] += $_actual_cost;
                                
$obligations[$_account_value][$_dummy_district][$_dimb] -= $_actual_cost;
                                $accout_info[$_account_value] = true;
@@ -1064,10 +1071,11 @@
 
 //-------end check active invoices-----------
 // end service agreements
-                       $this->sum_budget_cost          = $sum_budget_cost;
-                       $this->sum_obligation_cost      = $sum_obligation_cost;
-                       $this->sum_actual_cost          = $sum_actual_cost;
-                       $this->sum_hits                         = $sum_hits;
+                       $this->sum_budget_cost                  = 
$sum_budget_cost;
+                       $this->sum_obligation_cost              = 
$sum_obligation_cost;
+                       $this->sum_actual_cost                  = 
$sum_actual_cost;
+                       $this->sum_actual_cost_period   = 
$sum_actual_cost_period;
+                       $this->sum_hits                                 = 
$sum_hits;
 
                        //_debug_array($actual_cost);die();
                        $result = array();
@@ -1110,14 +1118,15 @@
                                                                || 
(isset($obligations[$b_account][$district_id][$dimb]) && 
$obligations[$b_account][$district_id][$dimb]))
                                                        {
                                                                $result[] = 
array(
-                                                                       
'grouping'              => $details ? '' : $b_account, 
-                                                                       
'b_account'             => $details ? $b_account : '',
-                                                                       
'district_id'   => $district_id,
-                                                                       
'ecodimb'               => $dimb,
-                                                                       
'actual_cost'   => isset($actual_cost[$b_account][$district_id][$dimb]) && 
$actual_cost[$b_account][$district_id][$dimb] ? 
round($actual_cost[$b_account][$district_id][$dimb]) : 0,
-                                                                       
'budget_cost'   => isset($budget_cost[$b_account][$district_id][$dimb]) && 
$budget_cost[$b_account][$district_id][$dimb] ? 
round($budget_cost[$b_account][$district_id][$dimb]) : 0,
-                                                                       
'obligation'    => isset($obligations[$b_account][$district_id][$dimb]) && 
$obligations[$b_account][$district_id][$dimb] ? 
round($obligations[$b_account][$district_id][$dimb]) : 0,
-                                                                       'hits'  
                => 
isset($hits[$b_account][$district_id][$dimb])?$hits[$b_account][$district_id][$dimb]:0,
+                                                                       
'grouping'                              => $details ? '' : $b_account, 
+                                                                       
'b_account'                             => $details ? $b_account : '',
+                                                                       
'district_id'                   => $district_id,
+                                                                       
'ecodimb'                               => $dimb,
+                                                                       
'actual_cost'                   => 
isset($actual_cost[$b_account][$district_id][$dimb]) && 
$actual_cost[$b_account][$district_id][$dimb] ? 
round($actual_cost[$b_account][$district_id][$dimb]) : 0,
+                                                                       
'actual_cost_period'    => 
isset($actual_cost_period[$b_account][$district_id][$dimb]) && 
$actual_cost_period[$b_account][$district_id][$dimb] ? 
round($actual_cost_period[$b_account][$district_id][$dimb]) : 0,
+                                                                       
'budget_cost'                   => 
isset($budget_cost[$b_account][$district_id][$dimb]) && 
$budget_cost[$b_account][$district_id][$dimb] ? 
round($budget_cost[$b_account][$district_id][$dimb]) : 0,
+                                                                       
'obligation'                    => 
isset($obligations[$b_account][$district_id][$dimb]) && 
$obligations[$b_account][$district_id][$dimb] ? 
round($obligations[$b_account][$district_id][$dimb]) : 0,
+                                                                       'hits'  
                                => 
isset($hits[$b_account][$district_id][$dimb])?$hits[$b_account][$district_id][$dimb]:0,
                                                                );
                                                        }
                                                }

Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php  
2014-01-27 18:44:57 UTC (rev 11635)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php  
2014-01-27 18:47:33 UTC (rev 11636)
@@ -1938,6 +1938,7 @@
                                if(isset($order_budget[$periode]))
                                {
                                        $order_budget[$periode]['actual_cost'] 
+= $this->db->f('actual_cost');
+                                       
$order_budget[$periode]['actual_period'] = $periode;
                                        $_found = true;
                                }
                                else
@@ -1948,6 +1949,7 @@
                                                
if(isset($order_budget[$_period]))
                                                {
                                                        
$order_budget[$_period]['actual_cost'] += $this->db->f('actual_cost');
+                                                       
$order_budget[$_period]['actual_period'] = $periode;
                                                        $_found = true;
                                                        break;
                                                }
@@ -1959,10 +1961,10 @@
                                        $order_budget[$_dummy_period]['year'] = 
substr( $_dummy_period, 0, 4 );
                                        $order_budget[$_dummy_period]['month'] 
= substr( $_dummy_period, -2);
                                        
$order_budget[$_dummy_period]['actual_cost'] += $this->db->f('actual_cost');
+                                       
$order_budget[$_dummy_period]['actual_period'] = $periode;
                                }
                        }
 
-
                        $sort_period = array();
                        $values = array();
                        $_current_period = date('Ym');
@@ -2031,7 +2033,8 @@
                                        'sum_orders'                    => 
$_sum_orders,
                                        'sum_oblications'               => 
$_sum_oblications,
                                        'actual_cost'                   => 
$_actual_cost,
-                                       'closed_order'                  => 
$_budget['closed_order']
+                                       'closed_order'                  => 
$_budget['closed_order'],
+                                       'actual_period'                 => 
$_budget['actual_period']                    
                                );
 
                                $sort_period[] = $period;

Modified: branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uibudget.inc.php     
2014-01-27 18:44:57 UTC (rev 11635)
+++ branches/Version-1_0-branch/property/inc/class.uibudget.inc.php     
2014-01-27 18:47:33 UTC (rev 11636)
@@ -1294,6 +1294,8 @@
                                array(
                                        'col_name'=>'actual_cost_ex',   
'visible'=>false,       'label'=>'',                            
'className'=>'rightClasss',     'sortable'=>false,      'sort_field'=>'',       
                'formatter'=>''),
                                array(
+                                       'col_name'=>'actual_cost_period',       
'visible'=>true,        'label'=>lang('paid') . ' ' . lang('period'),           
'className'=>'rightClasss',     'sortable'=>false,      'sort_field'=>'',       
                'formatter'=>''),
+                               array(
                                        'col_name'=>'actual_cost',      
'visible'=>true,        'label'=>lang('paid'),          
'className'=>'rightClasss',     'sortable'=>false,      'sort_field'=>'',       
                'formatter'=>'myFormatLink_Count'),
                                array(
                                        
'col_name'=>'link_actual_cost','visible'=>false,        'label'=>'',            
                'className'=>'rightClasss',     'sortable'=>false,      
'sort_field'=>'',                       'formatter'=>''),
@@ -1350,6 +1352,7 @@
                                                        'obligation'            
=> number_format($entry['obligation'], 0, ',', ' '),
                                                        'link_obligation'       
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.index', 'filter'=>'all', 'paid'=>1, 'district_id'=> 
$entry['district_id'], 'b_group'=> $entry['grouping'], 'b_account' 
=>$entry['b_account'], 'start_date'=> $start_date, 'end_date'=> $end_date, 
'ecodimb' => $entry['ecodimb'], 'status_id' => 'all', 'obligation' => true)),
                                                        'actual_cost_ex'        
=> $entry['actual_cost'],
+                                                       'actual_cost_period'=> 
number_format($entry['actual_cost_period'], 0, ',', ' '),
                                                        'actual_cost'           
=> number_format($entry['actual_cost'], 0, ',', ' '),
                                                        'link_actual_cost'      
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiinvoice.consume', 'district_id'=> $entry['district_id'], 
'b_account_class'=> $entry['grouping'], 'b_account' =>$entry['b_account'],  
'start_date'=> $start_date, 'end_date'=> $end_date, 'ecodimb' => 
$entry['ecodimb'], 'submit_search'=>true)),
                                                        'diff_ex'               
        => $entry['budget_cost'] - $entry['actual_cost'] - $entry['obligation'],
@@ -1429,6 +1432,7 @@
                                        'sum_budget'            => 
$this->bo->sum_budget_cost,
                                        'sum_obligation'        => 
$this->bo->sum_obligation_cost,
                                        'sum_actual'            => 
$this->bo->sum_actual_cost,
+                                       'sum_actual_period'     => 
$this->bo->sum_actual_cost_period,
                                        'sum_diff'                      => 
$this->bo->sum_budget_cost - $this->bo->sum_actual_cost - 
$this->bo->sum_obligation_cost,
                                        'sum_hits'                      => 
$this->bo->sum_hits
                                );

Modified: branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js 
2014-01-27 18:44:57 UTC (rev 11635)
+++ branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js 
2014-01-27 18:47:33 UTC (rev 11636)
@@ -168,6 +168,7 @@
 
                        tmp_sum_budget = 
YAHOO.util.Number.format(values_ds.sum_budget, {decimalPlaces:0, 
decimalSeparator:",", thousandsSeparator:" "});                       
                        tmp_sum_obligation = 
YAHOO.util.Number.format(values_ds.sum_obligation, {decimalPlaces:0, 
decimalSeparator:",", thousandsSeparator:" "});
+                       tmp_sum_actual_period = 
YAHOO.util.Number.format(values_ds.sum_actual_period, {decimalPlaces:0, 
decimalSeparator:",", thousandsSeparator:" "});
                        tmp_sum_actual = 
YAHOO.util.Number.format(values_ds.sum_actual, {decimalPlaces:0, 
decimalSeparator:",", thousandsSeparator:" "});
                        tmp_sum_diff = 
YAHOO.util.Number.format(values_ds.sum_diff, {decimalPlaces:0, 
decimalSeparator:",", thousandsSeparator:" "});
                        tmp_sum_hits = 
YAHOO.util.Number.format(values_ds.sum_hits, {decimalPlaces:0, 
decimalSeparator:",", thousandsSeparator:" "});
@@ -179,6 +180,7 @@
                        td_empty(1);
                        td_sum(tmp_sum_obligation);
                        td_empty(2);
+                       td_sum(tmp_sum_actual_period);
                        td_sum(tmp_sum_actual);
                        td_empty(2);                    
                        td_sum(tmp_sum_diff);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]