[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12093] Merge 12087:12092 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12093] Merge 12087:12092 from trunk |
|
Date: |
Mon, 15 Sep 2014 12:52:51 +0000 |
Revision: 12093
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12093
Author: sigurdne
Date: 2014-09-15 12:52:50 +0000 (Mon, 15 Sep 2014)
Log Message:
-----------
Merge 12087:12092 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
branches/Version-1_0-branch/property/js/yahoo/tts.view.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/setup/setup.inc.php
branches/Version-1_0-branch/property/setup/tables_current.inc.php
branches/Version-1_0-branch/property/setup/tables_update.inc.php
branches/Version-1_0-branch/property/templates/base/tts.xsl
branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/soap.php
Added Paths:
-----------
branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/Receive.wsdl
Removed Paths:
-------------
branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/Receive.wdsl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086,12088-12092
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2014-09-15 09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2014-09-15 12:52:50 UTC (rev 12093)
@@ -260,12 +260,6 @@
'name'=> lang('actual cost')
);
- $columns['actual_cost_year'] = array
- (
- 'id' => 'actual_cost_year',
- 'name'=> lang('year')
- );
-
$columns['difference'] = array
(
'id' => 'difference',
@@ -1652,4 +1646,14 @@
$values = $this->custom->prepare($values, 'property',
'.ticket', false);
return $values;
}
+
+ public function get_payments($id)
+ {
+ $payments = $this->so->get_payments($id);
+ foreach($payments as &$payment)
+ {
+ $payment['created_on_date'] =
$GLOBALS['phpgw']->common->show_date($payment['created_on'],$this->dateformat);
+ }
+ return $payments;
+ }
}
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2014-09-15 09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2014-09-15 12:52:50 UTC (rev 12093)
@@ -390,11 +390,28 @@
$where = 'AND';
}
+ $actual_cost_field = 'fm_tts_tickets.actual_cost';
if ($start_date)
{
- $end_date = $end_date + 3600 * 16 +
phpgwapi_datetime::user_timezone();
- $start_date = $start_date - 3600 * 8 +
phpgwapi_datetime::user_timezone();
- $filtermethod .= " $where
fm_tts_tickets.entry_date >= $start_date AND fm_tts_tickets.entry_date <=
$end_date ";
+ $order_add =
$GLOBALS['phpgw']->acl->check('.ticket.order', PHPGW_ACL_ADD, 'property');
+ $order_edit =
$GLOBALS['phpgw']->acl->check('.ticket.order', PHPGW_ACL_EDIT, 'property');
+
+ if($order_add || $order_edit)
+ {
+ $end_date = date('Ym', $end_date);
+ $start_date = date('Ym',
$start_date);
+ $filtermethod .= " $where
fm_tts_payments.period >= $start_date AND fm_tts_payments.period <= $end_date ";
+ $date_join = " LEFT OUTER JOIN
fm_tts_payments ON fm_tts_tickets.id=fm_tts_payments.ticket_id";
+ $actual_cost_field =
'SUM(fm_tts_payments.amount) AS actual_cost';
+ }
+ else
+ {
+ $end_date = $end_date + 3600 * 16
+ phpgwapi_datetime::user_timezone();
+ $start_date = $start_date - 3600 *
8 + phpgwapi_datetime::user_timezone();
+ $filtermethod .= " $where
fm_tts_tickets.entry_date >= $start_date AND fm_tts_tickets.entry_date <=
$end_date ";
+ $date_join = '';
+ }
+
$where= 'AND';
}
@@ -458,8 +475,8 @@
$return_fields =
"fm_tts_tickets.id,fm_tts_tickets.assignedto,fm_tts_tickets.status,fm_tts_tickets.user_id,"
.
"fm_tts_tickets.subject,fm_tts_tickets.address,fm_tts_tickets.location_code,fm_tts_tickets.priority,fm_tts_tickets.cat_id,fm_tts_tickets.group_id,"
- .
"fm_tts_tickets.entry_date,fm_tts_tickets.modified_date,fm_tts_tickets.finnish_date,fm_tts_tickets.finnish_date2,fm_tts_tickets.order_id,fm_tts_tickets.vendor_id,fm_tts_tickets.actual_cost,"
- .
"fm_tts_tickets.actual_cost_year,fm_tts_tickets.budget,fm_tts_tickets.billable_hours,fm_district.descr
as district,fm_tts_views.id as
view,fm_location1.loc1_name,fm_tts_tickets.ecodimb {$result_order_field}";
+ .
"fm_tts_tickets.entry_date,fm_tts_tickets.modified_date,fm_tts_tickets.finnish_date,fm_tts_tickets.finnish_date2,fm_tts_tickets.order_id,fm_tts_tickets.vendor_id,"
+ .
"fm_tts_tickets.budget,fm_tts_tickets.billable_hours,fm_district.descr as
district,fm_tts_views.id as view,fm_location1.loc1_name,fm_tts_tickets.ecodimb
{$result_order_field}";
$custom_cols = $this->custom->find('property',
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
@@ -468,11 +485,11 @@
$return_fields .=
",fm_tts_tickets.{$custom_col['column_name']}";
}
- $sql = "SELECT DISTINCT {$return_fields} FROM
fm_tts_tickets"
+ $sql = "SELECT DISTINCT
{$return_fields},{$actual_cost_field} FROM fm_tts_tickets"
. " {$this->left_join} fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
. " {$this->left_join} fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
. " {$this->left_join} fm_district ON
fm_district.id = fm_part_of_town.district_id"
- . " {$order_join}"
+ . " {$order_join}{$date_join}"
. " LEFT OUTER JOIN fm_tts_views ON
(fm_tts_tickets.id = fm_tts_views.id AND
fm_tts_views.account_id='{$this->account}')";
if(isset($custom_filter['joinmethod_datatype']) &&
$custom_filter['joinmethod_datatype'])
@@ -483,13 +500,14 @@
}
}
- $sql .= " {$filtermethod} {$querymethod}";
+ $group_fields = str_ireplace(array('fm_district.descr
as district', 'fm_tts_views.id as view'),
array('fm_district.descr','fm_tts_views.id'), $return_fields);
+ $sql .= " {$filtermethod} {$querymethod} GROUP BY
{$group_fields}";
- $sql_cnt = "SELECT DISTINCT fm_tts_tickets.budget
,fm_tts_tickets.actual_cost, fm_tts_tickets.id FROM fm_tts_tickets"
+ $sql_cnt = "SELECT DISTINCT fm_tts_tickets.budget
,{$actual_cost_field}, fm_tts_tickets.id FROM fm_tts_tickets"
. " {$this->left_join} fm_location1 ON
fm_tts_tickets.loc1=fm_location1.loc1"
. " {$this->left_join} fm_part_of_town ON
fm_location1.part_of_town_id=fm_part_of_town.part_of_town_id"
. " {$this->left_join} fm_district ON
fm_district.id = fm_part_of_town.district_id"
- . " $order_join"
+ . " {$order_join}{$date_join}"
. " LEFT OUTER JOIN fm_tts_views ON
(fm_tts_tickets.id = fm_tts_views.id AND
fm_tts_views.account_id='{$this->account}')";
if(isset($custom_filter['joinmethod_datatype']) &&
$custom_filter['joinmethod_datatype'])
@@ -512,7 +530,7 @@
if(!$cache_info)
{
- $sql2 = "SELECT count(*) as cnt, sum(budget) as
sum_budget, sum(actual_cost) as sum_actual_cost FROM ({$sql_cnt}) as t";
+ $sql2 = "SELECT count(*) as cnt, sum(budget) as
sum_budget, sum(actual_cost) as sum_actual_cost FROM ({$sql_cnt} GROUP BY
fm_tts_tickets.id, fm_tts_tickets.budget) as t";
$this->db->query($sql2,__LINE__,__FILE__);
$this->db->next_record();
unset($sql2);
@@ -537,7 +555,7 @@
}
$filter_closed = "{$where}
fm_tts_tickets.status NOT IN ('" . implode("','", $closed_status) . "')";
- $sql2 = "SELECT (sum(budget) -
sum(actual_cost)) as sum_difference FROM ({$sql_cnt} {$filter_closed}) as t";
+ $sql2 = "SELECT (SUM(budget) -
SUM(actual_cost)) as sum_difference FROM ({$sql_cnt} {$filter_closed} GROUP BY
fm_tts_tickets.id, fm_tts_tickets.budget) as t";
$this->db->query($sql2,__LINE__,__FILE__);
$this->db->next_record();
unset($sql2);
@@ -601,7 +619,6 @@
'order_id'
=> $this->db->f('order_id'),
'vendor_id'
=> $this->db->f('vendor_id'),
'actual_cost'
=> $this->db->f('actual_cost'),
- 'actual_cost_year'
=> $this->db->f('actual_cost_year'),
'estimate'
=> $this->db->f('budget'),
'new_ticket'
=> $this->db->f('view') ? false : true,
'billable_hours'
=> $this->db->f('billable_hours'),
@@ -693,7 +710,6 @@
$ticket['ecodimb'] =
$this->db->f('ecodimb');
$ticket['budget'] =
$this->db->f('budget');
$ticket['actual_cost'] =
$this->db->f('actual_cost');
- $ticket['actual_cost_year'] =
$this->db->f('actual_cost_year');
$ticket['order_cat_id'] =
$this->db->f('order_cat_id');
$ticket['building_part'] =
$this->db->f('building_part',true);
$ticket['order_dim1'] =
$this->db->f('order_dim1');
@@ -1083,7 +1099,6 @@
// $old_billable_rate = $this->db->f('billable_rate');
$old_subject =
$this->db->f('subject');
$old_contact_id =
$this->db->f('contact_id');
- $old_actual_cost =
$this->db->f('actual_cost');
$old_order_cat_id =
$this->db->f('order_cat_id');
$old_building_part =
$this->db->f('building_part',true);
$old_order_dim1 =
(int)$this->db->f('order_dim1');
@@ -1432,11 +1447,31 @@
if($order_add || $order_edit)
{
- if ((int)$old_actual_cost !=
(int)$ticket['actual_cost'])
+ if ((int)$ticket['actual_cost'])
{
- $this->db->query("UPDATE fm_tts_tickets
SET actual_cost='" . (float)$ticket['actual_cost']
+
+ $this->db->query("SELECT sum(amount) AS
actual_cost FROM fm_tts_payments WHERE ticket_id = {$id}", __LINE__,__FILE__);
+ $this->db->next_record();
+ $old_actual_cost =
$this->db->f('actual_cost');
+ $new_actual_cost = $old_actual_cost +
$ticket['actual_cost'];
+
+ $this->db->query("UPDATE fm_tts_tickets
SET actual_cost='" . (float) $new_actual_cost
. "' WHERE
id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('AC',$id,(float)$ticket['actual_cost'] ,
$old_actual_cost);
+
+ $value_set_cost = array
+ (
+ 'ticket_id' => $id,
+ 'amount' =>
$ticket['actual_cost'],
+ 'period' =>
$ticket['actual_cost_period'],
+ 'created_on'=> time(),
+ 'created_by'=> $this->account
+ );
+
+ $cols_cost = implode(',',
array_keys($value_set_cost));
+ $values_cost =
$this->db->validate_insert(array_values($value_set_cost));
+ $this->db->query("INSERT INTO
fm_tts_payments ({$cols_cost}) VALUES ({$values_cost})");
+
+
$this->historylog->add('AC',$id,(float)$new_actual_cost , $old_actual_cost);
$receipt['message'][]= array('msg' =>
lang('actual cost has been updated'));
}
@@ -1476,7 +1511,6 @@
$value_set['b_account_id'] =
$ticket['b_account_id'];
$value_set['order_descr'] =
$this->db->db_addslashes($ticket['order_descr']);
$value_set['ecodimb'] =
$ticket['ecodimb'];
- $value_set['actual_cost_year'] =
$ticket['actual_cost_year'];
$value_set['branch_id'] =
$ticket['branch_id'];
}
@@ -1693,4 +1727,29 @@
return $values;
}
+
+ public function get_payments($id)
+ {
+ $id = (int) $id;
+ $values = array();
+ $sql = "SELECT * FROM fm_tts_payments WHERE ticket_id =
{$id} ORDER BY period ASC";
+
+ $this->db->query($sql, __LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $values[] = array
+ (
+ 'id' => $this->db->f('id'),
+ 'ticket_id' =>
$this->db->f('ticket_id'),
+ 'amount' =>
$this->db->f('amount'),
+ 'period' =>
$this->db->f('period'),
+ 'created_on'=>
$this->db->f('created_on'),
+ 'created_by'=>
$this->db->f('created_by'),
+ 'remark' =>
$this->db->f('remark', true)
+ );
+ }
+ return $values;
+ }
+
}
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2014-09-15 09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2014-09-15 12:52:50 UTC (rev 12093)
@@ -3218,7 +3218,28 @@
'footer'
=> 0
);
+ $myColumnDefs[4] = array
+ (
+ 'name' => "4",
+ 'values' =>
json_encode(array( array('key' =>
'period','label'=>lang('period'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'amount','label'=>lang('amount'),'sortable'=>true,'resizeable'=>true,
'formatter'=> 'FormatterAmount2'),
+
array('key' =>
'remark','label'=>lang('remark'),'sortable'=>false,'resizeable'=>true)))
+ );
+ $payments = $this->bo->get_payments($id);
+
+ $datavalues[4] = array
+ (
+ 'name'
=> "4",
+ 'values'
=> json_encode($payments),
+ 'total_records' =>
count($payments),
+ 'permission' => "''",
+ 'is_paginator' => 1,
+ 'edit_action' => "''",
+ 'footer'
=> 0
+ );
+
+
$location_id =
$GLOBALS['phpgw']->locations->get_id('property', $this->acl_location);
$notify_info =
execMethod('property.notify.get_yui_table_def',array
(
@@ -3318,6 +3339,8 @@
'value_budget'
=> $ticket['budget'],
'value_actual_cost'
=> $ticket['actual_cost'],
'year_list'
=> array('options' => $this->bocommon->select_list(
$ticket['actual_cost_year'] ? $ticket['actual_cost_year'] : date('Y'),
$year_list )),
+ 'period_list'
=> array('options' => execMethod('property.boinvoice.period_list',
date('Ym'))),
+
'need_approval'
=> $need_approval,
'value_approval_mail_address' =>
$supervisor_email,
// 'vendor_email'
=> $vendor_email,
Modified:
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2014-09-15 09:10:13 UTC (rev 12092)
+++
branches/Version-1_0-branch/property/inc/cron/default/import_oppdatering_av_bestilling_fra_agresso_bkb.php
2014-09-15 12:52:50 UTC (rev 12093)
@@ -61,14 +61,14 @@
$dirname =
$this->config->config_data['import']['local_path'];
// prevent path traversal
- if ( preg_match('/\./', $dirname)
+ if ( preg_match('/\./', $dirname)
|| !is_dir($dirname) )
{
return array();
}
$file_list = array();
- $dir = new DirectoryIterator($dirname);
+ $dir = new DirectoryIterator($dirname);
if ( is_object($dir) )
{
foreach ( $dir as $file )
@@ -127,7 +127,7 @@
$this->db->transaction_abort();
}
}
-
+
if (!$this->debug)
{
$this->alert_assigned();
@@ -193,7 +193,7 @@
if( preg_match('/csv$/i', $file_name) )
{
- $file_remote = $file_name;
+ $file_remote = $file_name;
$file_local =
"{$directory_local}/{$file_name}";
$fp = fopen($file_local, "wb");
@@ -220,7 +220,7 @@
}
else
{
- echo "Feiler på
ftp_fget()<br/>";
+ echo "Feiler på
ftp_fget()<br/>";
}
fclose($fp);
}
@@ -266,12 +266,9 @@
$order_id = trim($data[2]);
$diff_actual_cost = (float)trim($data[3]);
- $this->db->query("SELECT id, actual_cost FROM
fm_tts_tickets WHERE order_id= '{$order_id}'",__LINE__,__FILE__);
+ $this->db->query("SELECT id FROM fm_tts_tickets WHERE
order_id= '{$order_id}'",__LINE__,__FILE__);
$this->db->next_record();
- $id
= $this->db->f('id');
- (float) $old_actual_cost =
$this->db->f('actual_cost');
-
- $new_actual_cost = $diff_actual_cost + $old_actual_cost;
+ $id = $this->db->f('id');
if(!$id)
{
@@ -279,6 +276,25 @@
return false;
}
+ $this->db->query("SELECT sum(amount) AS actual_cost
FROM fm_tts_payments WHERE ticket_id = {$id}", __LINE__,__FILE__);
+ $this->db->next_record();
+ $old_actual_cost = (float)$this->db->f('actual_cost');
+ $new_actual_cost = $old_actual_cost + $diff_actual_cost;
+
+ $value_set_cost = array
+ (
+ 'ticket_id' => $id,
+ 'amount' => $diff_actual_cost,
+ 'period' => date('Ym'),
+ 'remark' => 'Oppdatert fra Agresso',
+ 'created_on'=> time(),
+ 'created_by'=> -1
+ );
+
+ $cols_cost = implode(',', array_keys($value_set_cost));
+ $values_cost =
$this->db->validate_insert(array_values($value_set_cost));
+ $this->db->query("INSERT INTO fm_tts_payments
({$cols_cost}) VALUES ({$values_cost})");
+
$this->receipt['message'][] = array('msg' =>"Oppdaterer
melding #{$id} for agresso prosjekt {$agresso_prosjekt}: gammelt beløp:
{$old_actual_cost}, nytt beløp: {$new_actual_cost}");
$this->historylog->add('AC',$id, $new_actual_cost ,
$old_actual_cost);
@@ -291,7 +307,7 @@
$value_set =
$this->db->validate_update($value_set);
$ok = $this->db->query("UPDATE fm_tts_tickets SET
$value_set WHERE id={$id}",__LINE__,__FILE__);
-
+
if($ok)
{
$this->updated_tickects[$id] = true;
@@ -345,7 +361,7 @@
{
$updated_tickects = array_keys($this->updated_tickects);
-
+
foreach ($updated_tickects as $id)
{
$this->db->query("SELECT assignedto FROM
fm_tts_tickets WHERE id= '{$id}'",__LINE__,__FILE__);
Modified: branches/Version-1_0-branch/property/js/yahoo/tts.view.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/tts.view.js 2014-09-15
09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/js/yahoo/tts.view.js 2014-09-15
12:52:50 UTC (rev 12093)
@@ -2,20 +2,56 @@
var myPaginator_1, myDataTable_1;
var myPaginator_2, myDataTable_2;
var myPaginator_3, myDataTable_3;
+var myPaginator_4, myDataTable_4;
+var myPaginator_5, myDataTable_5;
var d;
var vendor_id = 0;
/********************************************************************************/
this.myParticularRenderEvent = function()
{
+ this.addFooterDatatable(myPaginator_4,myDataTable_4);
}
+this.addFooterDatatable = function(paginator,datatable)
+{
+ //call getSumPerPage(name of column) in property.js
+ tmp_sum1 = getTotalSum('amount',2,paginator,datatable);
+
+ if(typeof(tableYUI)=='undefined')
+ {
+ tableYUI =
YAHOO.util.Dom.getElementsByClassName("yui-dt-data","tbody")[2].parentNode;
+ tableYUI.setAttribute("id","tableYUI");
+ }
+ else
+ {
+ tableYUI.deleteTFoot();
+ }
+
+ //Create ROW
+ newTR = document.createElement('tr');
+
+ td_sum('Sum');
+ td_sum(tmp_sum1);
+ td_empty(1);
+
+ myfoot = tableYUI.createTFoot();
+ myfoot.setAttribute("id","myfoot");
+ myfoot.appendChild(newTR);
+}
+
/********************************************************************************/
var FormatterCenter = function(elCell, oRecord, oColumn, oData)
{
elCell.innerHTML = "<center>"+oData+"</center>";
}
+var FormatterAmount2 = function(elCell, oRecord, oColumn, oData)
+{
+ var amount = YAHOO.util.Number.format(oData, {decimalPlaces:2,
decimalSeparator:",", thousandsSeparator:" "});
+ elCell.innerHTML = "<div align=\"right\">"+amount+"</div>";
+}
+
/********************************************************************************/
this.confirm_session = function(action)
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2014-09-15
09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2014-09-15
12:52:50 UTC (rev 12093)
@@ -1223,6 +1223,7 @@
park invoice property no Parker faktura
part of town property no Bydel
part of town id property no Bydel
+payment property no Betaling
payment date property no Forfallsdato
pdf property no PDF
per agreement property no pr avtale
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2014-09-15
09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2014-09-15
12:52:50 UTC (rev 12093)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.684';
+ $setup_info['property']['version'] = '0.9.17.685';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -140,6 +140,7 @@
'fm_tts_tickets',
'fm_tts_history',
'fm_tts_views',
+ 'fm_tts_payments',
'fm_org_unit',
'fm_ecoart',
'fm_ecoavvik',
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2014-09-15 09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2014-09-15 12:52:50 UTC (rev 12093)
@@ -1086,6 +1086,21 @@
'fk' => array(),
'uc' => array()
),
+ 'fm_tts_payments' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto','nullable' =>
False),
+ 'ticket_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'amount' => array('type' =>
'decimal','precision' => '20','scale' => '2','default' => '0','nullable' =>
false),
+ 'period' => array('type' => 'int','precision'
=> '4','nullable' => false),
+ 'remark' => array('type' => 'text','nullable'
=> true),
+ 'created_on' => array('type' => 'int',
'precision' => 4,'nullable' => true),
+ 'created_by' => array('type' => 'int',
'precision' => 4,'nullable' => true),
+ ),
+ 'pk' => array('id'),
+ 'ix' => array(),
+ 'fk' => array('fm_tts_tickets' => array('ticket_id' =>
'id')),
+ 'uc' => array()
+ ),
'fm_org_unit' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2014-09-15 09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2014-09-15 12:52:50 UTC (rev 12093)
@@ -8083,7 +8083,7 @@
}
/**
- * Update property version from 0.9.17.681 to 0.9.17.682
+ * Update property version from 0.9.17.683 to 0.9.17.684
* Add tender related dates to workorder
*/
$test[] = '0.9.17.683';
@@ -8103,3 +8103,66 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+ /**
+ * Update property version from 0.9.17.684 to 0.9.17.685
+ * Add tender related dates to workorder
+ */
+ $test[] = '0.9.17.684';
+ function property_upgrade0_9_17_684()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_tts_payments', array(
+ 'fd' => array(
+ 'id' => array('type' =>
'auto','nullable' => False),
+ 'ticket_id' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'amount' => array('type' =>
'decimal','precision' => '20','scale' => '2','default' => '0','nullable' =>
false),
+ 'period' => array('type' =>
'int','precision' => '4','nullable' => false),
+ 'remark' => array('type' =>
'text','nullable' => true),
+ 'created_on' => array('type' => 'int',
'precision' => 4,'nullable' => true),
+ 'created_by' => array('type' => 'int',
'precision' => 4,'nullable' => true),
+ ),
+ 'pk' => array('id'),
+ 'ix' => array(),
+ 'fk' => array('fm_tts_tickets' =>
array('ticket_id' => 'id')),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT id, actual_cost,
modified_date FROM fm_tts_tickets WHERE actual_cost != '0.00' ORDER BY
modified_date");
+
+ $tickets = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $tickets[] = array
+ (
+ 'id' =>
$GLOBALS['phpgw_setup']->oProc->f('id'),
+ 'actual_cost' =>
$GLOBALS['phpgw_setup']->oProc->f('actual_cost'),
+ 'modified_date' =>
$GLOBALS['phpgw_setup']->oProc->f('modified_date')
+ );
+ }
+
+ foreach($tickets as $ticket)
+ {
+ $period = date('Ym', $ticket['modified_date']);
+ $value_set = array
+ (
+ 'ticket_id' => $ticket['id'],
+ 'amount' => $ticket['actual_cost'],
+ 'period' => $period,
+ 'created_on'=> $ticket['modified_date']
+ );
+ $cols = implode(',', array_keys($value_set));
+ $values =
$GLOBALS['phpgw_setup']->oProc->validate_insert(array_values($value_set));
+ $sql = "INSERT INTO fm_tts_payments ({$cols}) VALUES
({$values})";
+
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+ }
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.685';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2014-09-15
09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2014-09-15
12:52:50 UTC (rev 12093)
@@ -940,29 +940,40 @@
<tr>
<td valign="top">
<label>
-
<xsl:value-of select="php:function('lang',
'actual cost')"/>
+
<xsl:value-of select="php:function('lang',
'payment')"/>
</label>
</td>
<td>
-
<input type="text" name="values[actual_cost]"
value="{value_actual_cost}">
+
<input type="text" name="values[actual_cost]">
<xsl:attribute name="title">
<xsl:value-of
select="php:function('lang', 'Enter actual cost')"/>
</xsl:attribute>
</input>
<xsl:text> </xsl:text> [ <xsl:value-of
select="currency"/> ]
-
<xsl:variable name="lang_year"><xsl:value-of
select="php:function('lang', 'year')"/></xsl:variable>
+
<xsl:variable name="lang_period"><xsl:value-of
select="php:function('lang', 'period')"/></xsl:variable>
-
<select name="values[actual_cost_year]">
+
<select name="values[actual_cost_period]">
<xsl:attribute name="title">
-
<xsl:value-of select='$lang_year'/>
+
<xsl:value-of select='$lang_period'/>
</xsl:attribute>
-
<xsl:apply-templates
select="year_list/options"/>
+
<xsl:apply-templates
select="period_list/options"/>
</select>
-
<xsl:text> </xsl:text> [ <xsl:value-of
select='$lang_year'/> ]
+
<xsl:text> </xsl:text> [ <xsl:value-of
select='$lang_period'/> ]
</td>
</tr>
<tr>
+
<td valign="top" class="th_text">
+
<label>
+
<xsl:value-of select="php:function('lang',
'actual cost')"/>
+
</label>
+
</td>
+
<td>
+
<div id="paging_4"> </div>
+
<div id="datatable-container_4"/>
+
</td>
+
</tr>
+
<tr>
<td valign="top">
<label>
<a href="javascript:template_lookup()">
@@ -1133,9 +1144,9 @@
</label>
</td>
<td>
- <div
id="paging_4"> </div>
- <div
id="datatable-container_4"/>
- <div
id="datatable-buttons_4"/>
+ <div
id="paging_5"> </div>
+ <div
id="datatable-container_5"/>
+ <div
id="datatable-buttons_5"/>
</td>
</tr>
</table>
Deleted: branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/Receive.wdsl
===================================================================
--- branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/Receive.wdsl
2014-09-15 09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/Receive.wdsl
2014-09-15 12:52:50 UTC (rev 12093)
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/";
xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/";
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/";
xmlns:tns="http://pswin.com/SOAP/Receive";
xmlns:s="http://www.w3.org/2001/XMLSchema";
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/";
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/";
targetNamespace="http://pswin.com/SOAP/Receive";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
- <wsdl:types>
- <s:schema elementFormDefault="qualified"
targetNamespace="http://pswin.com/SOAP/Receive";>
- <s:element name="ReceiveSMSMessage">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="m"
type="tns:IncomingSMSMessage" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:complexType name="IncomingSMSMessage">
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="ReceiverNumber"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="SenderNumber"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Text" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="Network"
nillable="true" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="Address"
nillable="true" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="Position"
nillable="true" type="tns:GSMPosition" />
- </s:sequence>
- </s:complexType>
- <s:complexType name="GSMPosition">
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="Longitude"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Lattitude"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Radius" type="s:string"
/>
- <s:element minOccurs="0" maxOccurs="1" name="County" type="s:string"
/>
- <s:element minOccurs="0" maxOccurs="1" name="Council"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="CouncilNumber"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Place" type="s:string"
/>
- <s:element minOccurs="0" maxOccurs="1" name="SubPlace"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="ZipCode"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="City" type="s:string" />
- </s:sequence>
- </s:complexType>
- <s:element name="ReceiveSMSMessageResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1"
name="ReceiveSMSMessageResult" type="tns:ReturnValue" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:complexType name="ReturnValue">
- <s:sequence>
- <s:element minOccurs="1" maxOccurs="1" name="Code" type="s:int" />
- <s:element minOccurs="0" maxOccurs="1" name="Description"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Reference"
type="s:string" />
- </s:sequence>
- </s:complexType>
- <s:element name="ReceiveDeliveryReport">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="dr"
type="tns:DeliveryReport" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:complexType name="DeliveryReport">
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="State" type="s:string"
/>
- <s:element minOccurs="0" maxOccurs="1" name="ReceiverNumber"
type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="DeliveryTime"
nillable="true" type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Reference"
type="s:string" />
- </s:sequence>
- </s:complexType>
- <s:element name="ReceiveDeliveryReportResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1"
name="ReceiveDeliveryReportResult" type="tns:ReturnValue" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:element name="ReceiveMMSMessage">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="m"
type="tns:IncomingMMSMessage" />
- </s:sequence>
- </s:complexType>
- </s:element>
- <s:complexType name="IncomingMMSMessage">
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1" name="ReceiverNumber"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="SenderNumber"
type="s:string" />
- <s:element minOccurs="0" maxOccurs="1" name="Subject"
type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="Network"
nillable="true" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="Address"
nillable="true" type="s:string" />
- <s:element minOccurs="1" maxOccurs="1" name="Position"
nillable="true" type="tns:GSMPosition" />
- <s:element minOccurs="0" maxOccurs="1" name="Data"
type="s:base64Binary" />
- </s:sequence>
- </s:complexType>
- <s:element name="ReceiveMMSMessageResponse">
- <s:complexType>
- <s:sequence>
- <s:element minOccurs="0" maxOccurs="1"
name="ReceiveMMSMessageResult" type="tns:ReturnValue" />
- </s:sequence>
- </s:complexType>
- </s:element>
- </s:schema>
- </wsdl:types>
- <wsdl:message name="ReceiveSMSMessageSoapIn">
- <wsdl:part name="parameters" element="tns:ReceiveSMSMessage" />
- </wsdl:message>
- <wsdl:message name="ReceiveSMSMessageSoapOut">
- <wsdl:part name="parameters" element="tns:ReceiveSMSMessageResponse" />
- </wsdl:message>
- <wsdl:message name="ReceiveDeliveryReportSoapIn">
- <wsdl:part name="parameters" element="tns:ReceiveDeliveryReport" />
- </wsdl:message>
- <wsdl:message name="ReceiveDeliveryReportSoapOut">
- <wsdl:part name="parameters" element="tns:ReceiveDeliveryReportResponse" />
- </wsdl:message>
- <wsdl:message name="ReceiveMMSMessageSoapIn">
- <wsdl:part name="parameters" element="tns:ReceiveMMSMessage" />
- </wsdl:message>
- <wsdl:message name="ReceiveMMSMessageSoapOut">
- <wsdl:part name="parameters" element="tns:ReceiveMMSMessageResponse" />
- </wsdl:message>
- <wsdl:portType name="SMSReceiveSoap">
- <wsdl:operation name="ReceiveSMSMessage">
- <wsdl:input message="tns:ReceiveSMSMessageSoapIn" />
- <wsdl:output message="tns:ReceiveSMSMessageSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="ReceiveDeliveryReport">
- <wsdl:input message="tns:ReceiveDeliveryReportSoapIn" />
- <wsdl:output message="tns:ReceiveDeliveryReportSoapOut" />
- </wsdl:operation>
- <wsdl:operation name="ReceiveMMSMessage">
- <wsdl:input message="tns:ReceiveMMSMessageSoapIn" />
- <wsdl:output message="tns:ReceiveMMSMessageSoapOut" />
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="SMSReceiveSoap" type="tns:SMSReceiveSoap">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; />
- <wsdl:operation name="ReceiveSMSMessage">
- <soap:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveSMSMessage"; style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="ReceiveDeliveryReport">
- <soap:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveDeliveryReport";
style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="ReceiveMMSMessage">
- <soap:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveMMSMessage"; style="document" />
- <wsdl:input>
- <soap:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="SMSReceiveSoap12" type="tns:SMSReceiveSoap">
- <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; />
- <wsdl:operation name="ReceiveSMSMessage">
- <soap12:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveSMSMessage"; style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="ReceiveDeliveryReport">
- <soap12:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveDeliveryReport";
style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="ReceiveMMSMessage">
- <soap12:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveMMSMessage"; style="document" />
- <wsdl:input>
- <soap12:body use="literal" />
- </wsdl:input>
- <wsdl:output>
- <soap12:body use="literal" />
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="SMSReceive">
- <wsdl:port name="SMSReceiveSoap" binding="tns:SMSReceiveSoap">
- <soap:address location="http://sms.pswin.com/SOAP/Receive.asmx"; />
- </wsdl:port>
- <wsdl:port name="SMSReceiveSoap12" binding="tns:SMSReceiveSoap12">
- <soap12:address location="http://sms.pswin.com/SOAP/Receive.asmx"; />
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
Copied: branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/Receive.wsdl
(from rev 12092, trunk/sms/inc/plugin/gateway/pswin/Receive.wsdl)
===================================================================
--- branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/Receive.wsdl
(rev 0)
+++ branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/Receive.wsdl
2014-09-15 12:52:50 UTC (rev 12093)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/";
xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/";
xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/";
xmlns:tns="http://pswin.com/SOAP/Receive";
xmlns:s="http://www.w3.org/2001/XMLSchema";
xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/";
xmlns:http="http://schemas.xmlsoap.org/wsdl/http/";
targetNamespace="http://pswin.com/SOAP/Receive";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
+ <wsdl:types>
+ <s:schema elementFormDefault="qualified"
targetNamespace="http://pswin.com/SOAP/Receive";>
+ <s:element name="ReceiveSMSMessage">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="m"
type="tns:IncomingSMSMessage" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="IncomingSMSMessage">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="ReceiverNumber"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="SenderNumber"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Text" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="Network"
nillable="true" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="Address"
nillable="true" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="Position"
nillable="true" type="tns:GSMPosition" />
+ </s:sequence>
+ </s:complexType>
+ <s:complexType name="GSMPosition">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="Longitude"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Lattitude"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Radius" type="s:string"
/>
+ <s:element minOccurs="0" maxOccurs="1" name="County" type="s:string"
/>
+ <s:element minOccurs="0" maxOccurs="1" name="Council"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="CouncilNumber"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Place" type="s:string"
/>
+ <s:element minOccurs="0" maxOccurs="1" name="SubPlace"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="ZipCode"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="City" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ <s:element name="ReceiveSMSMessageResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1"
name="ReceiveSMSMessageResult" type="tns:ReturnValue" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="ReturnValue">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="Code" type="s:int" />
+ <s:element minOccurs="0" maxOccurs="1" name="Description"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Reference"
type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ <s:element name="ReceiveDeliveryReport">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="dr"
type="tns:DeliveryReport" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="DeliveryReport">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="State" type="s:string"
/>
+ <s:element minOccurs="0" maxOccurs="1" name="ReceiverNumber"
type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="DeliveryTime"
nillable="true" type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Reference"
type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ <s:element name="ReceiveDeliveryReportResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1"
name="ReceiveDeliveryReportResult" type="tns:ReturnValue" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="ReceiveMMSMessage">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="m"
type="tns:IncomingMMSMessage" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:complexType name="IncomingMMSMessage">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="ReceiverNumber"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="SenderNumber"
type="s:string" />
+ <s:element minOccurs="0" maxOccurs="1" name="Subject"
type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="Network"
nillable="true" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="Address"
nillable="true" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="Position"
nillable="true" type="tns:GSMPosition" />
+ <s:element minOccurs="0" maxOccurs="1" name="Data"
type="s:base64Binary" />
+ </s:sequence>
+ </s:complexType>
+ <s:element name="ReceiveMMSMessageResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1"
name="ReceiveMMSMessageResult" type="tns:ReturnValue" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ </s:schema>
+ </wsdl:types>
+ <wsdl:message name="ReceiveSMSMessageSoapIn">
+ <wsdl:part name="parameters" element="tns:ReceiveSMSMessage" />
+ </wsdl:message>
+ <wsdl:message name="ReceiveSMSMessageSoapOut">
+ <wsdl:part name="parameters" element="tns:ReceiveSMSMessageResponse" />
+ </wsdl:message>
+ <wsdl:message name="ReceiveDeliveryReportSoapIn">
+ <wsdl:part name="parameters" element="tns:ReceiveDeliveryReport" />
+ </wsdl:message>
+ <wsdl:message name="ReceiveDeliveryReportSoapOut">
+ <wsdl:part name="parameters" element="tns:ReceiveDeliveryReportResponse" />
+ </wsdl:message>
+ <wsdl:message name="ReceiveMMSMessageSoapIn">
+ <wsdl:part name="parameters" element="tns:ReceiveMMSMessage" />
+ </wsdl:message>
+ <wsdl:message name="ReceiveMMSMessageSoapOut">
+ <wsdl:part name="parameters" element="tns:ReceiveMMSMessageResponse" />
+ </wsdl:message>
+ <wsdl:portType name="SMSReceiveSoap">
+ <wsdl:operation name="ReceiveSMSMessage">
+ <wsdl:input message="tns:ReceiveSMSMessageSoapIn" />
+ <wsdl:output message="tns:ReceiveSMSMessageSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="ReceiveDeliveryReport">
+ <wsdl:input message="tns:ReceiveDeliveryReportSoapIn" />
+ <wsdl:output message="tns:ReceiveDeliveryReportSoapOut" />
+ </wsdl:operation>
+ <wsdl:operation name="ReceiveMMSMessage">
+ <wsdl:input message="tns:ReceiveMMSMessageSoapIn" />
+ <wsdl:output message="tns:ReceiveMMSMessageSoapOut" />
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="SMSReceiveSoap" type="tns:SMSReceiveSoap">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http"; />
+ <wsdl:operation name="ReceiveSMSMessage">
+ <soap:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveSMSMessage"; style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="ReceiveDeliveryReport">
+ <soap:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveDeliveryReport";
style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="ReceiveMMSMessage">
+ <soap:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveMMSMessage"; style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:binding name="SMSReceiveSoap12" type="tns:SMSReceiveSoap">
+ <soap12:binding transport="http://schemas.xmlsoap.org/soap/http"; />
+ <wsdl:operation name="ReceiveSMSMessage">
+ <soap12:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveSMSMessage"; style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="ReceiveDeliveryReport">
+ <soap12:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveDeliveryReport";
style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="ReceiveMMSMessage">
+ <soap12:operation
soapAction="http://pswin.com/SOAP/Receive/ReceiveMMSMessage"; style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="SMSReceive">
+ <wsdl:port name="SMSReceiveSoap" binding="tns:SMSReceiveSoap">
+ <soap:address location="http://sms.pswin.com/SOAP/Receive.asmx"; />
+ </wsdl:port>
+ <wsdl:port name="SMSReceiveSoap12" binding="tns:SMSReceiveSoap12">
+ <soap12:address location="http://sms.pswin.com/SOAP/Receive.asmx"; />
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Modified: branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/soap.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/soap.php
2014-09-15 09:10:13 UTC (rev 12092)
+++ branches/Version-1_0-branch/sms/inc/plugin/gateway/pswin/soap.php
2014-09-15 12:52:50 UTC (rev 12093)
@@ -97,7 +97,13 @@
* @global object $GLOBALS['server']
*/
- $wdsl = PHPGW_SERVER_ROOT .
'/sms/inc/plugin/gateway/pswin/Receive.wdsl';
+ $wsdl = PHPGW_SERVER_ROOT .
'/sms/inc/plugin/gateway/pswin/Receive.wsdl';
+ if(isset($_GET['wsdl']))
+ {
+ header('Content-Type: text/xml');
+ readfile($wsdl);
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
$options = array
(
@@ -107,7 +113,7 @@
);
ini_set("soap.wsdl_cache_enabled","0");
- $GLOBALS['server'] = new SoapServer($wdsl, $options);
+ $GLOBALS['server'] = new SoapServer($wsdl, $options);
/**
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12093] Merge 12087:12092 from trunk,
Sigurd Nes <=