[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12019] Merge 12016:12018 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12019] Merge 12016:12018 from trunk |
|
Date: |
Mon, 23 Jun 2014 12:35:25 +0000 |
Revision: 12019
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12019
Author: sigurdne
Date: 2014-06-23 12:35:24 +0000 (Mon, 23 Jun 2014)
Log Message:
-----------
Merge 12016:12018 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.bowo_hour.inc.php
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.sowo_hour.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-1_0-branch/property/js/yahoo/tts.index.simple.js
branches/Version-1_0-branch/property/js/yahoo/wo_hour.index.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
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
+
/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
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2014-06-23 12:35:24 UTC (rev 12019)
@@ -1408,7 +1408,7 @@
$values_attribute =
$this->custom->convert_attribute_save($values_attribute);
}
- $receipt = $this->so->update_ticket($data, $id,
$receipt, $values_attribute);
+ $receipt = $this->so->update_ticket($data, $id,
$receipt, $values_attribute, $this->simple);
$this->fields_updated = $this->so->fields_updated;
$criteria = array
Modified: branches/Version-1_0-branch/property/inc/class.bowo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bowo_hour.inc.php
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/inc/class.bowo_hour.inc.php
2014-06-23 12:35:24 UTC (rev 12019)
@@ -408,6 +408,50 @@
return $receipt;
}
+ /**
+ *
+ * @param type $data
+ * @param type $workorder_id
+ */
+ function import_calculation($data, $workorder_id)
+ {
+ $GLOBALS['phpgw']->db->transaction_begin();
+ foreach($data as $section => $valueset)
+ {
+ $section_name = $valueset['name'];
+ foreach($valueset['data'] as $entry)
+ {
+ if((int)$entry[4] > 0)
+ {
+ $values = array
+ (
+ 'activity_num'
=> $entry[0],
+ 'descr'
=> $entry[1],
+ 'unit'
=> 8, // FIXME
+ 'cost'
=> $entry[5],
+ 'quantity'
=> $entry[4],
+ 'billperae'
=> $entry[3],
+ 'ns3420_id'
=> '',
+ 'dim_d'
=> '',
+ 'new_grouping'
=> $section_name,
+ 'building_part_id'
=> '',
+ 'tolerance_id'
=> '',
+ );
+ try
+ {
+
$this->so->add_custom_hour($values,$workorder_id);
+ }
+ catch(Exception $exc)
+ {
+ throw
$exc->getTraceAsString();
+ }
+ }
+ }
+
+ }
+ $GLOBALS['phpgw']->db->transaction_commit();
+ }
+
function get_email($selected, $vendor_id)
{
$email_list = $this->so->get_email($vendor_id);
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2014-06-23 12:35:24 UTC (rev 12019)
@@ -1414,7 +1414,7 @@
if(isset($this->config->config_data['invoice_acl']) &&
$this->config->config_data['invoice_acl'] == 'dimb')
{
- $sql = "SELECT
DISTINCT fm_ecodimb.* FROM fm_ecodimb {$this->db->join} fm_ecodimb_role_user ON
fm_ecodimb.id = fm_ecodimb_role_user.ecodimb"
+ $sql = "SELECT DISTINCT fm_ecodimb.* FROM
fm_ecodimb {$this->db->join} fm_ecodimb_role_user ON fm_ecodimb.id =
fm_ecodimb_role_user.ecodimb"
. ' WHERE fm_ecodimb_role_user.user_id = ' .
(int) $this->account_id
. ' AND expired_on IS NULL'
. ' ORDER BY descr ASC';
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2014-06-23 12:35:24 UTC (rev 12019)
@@ -1053,13 +1053,13 @@
}
- function update_ticket(&$ticket,$id = 0, $receipt = array(),
$values_attribute = array())
+ function update_ticket(&$ticket,$id = 0, $receipt = array(),
$values_attribute = array(), $simple = false)
{
$this->fields_updated = array();
$id = (int) $id;
$ticket['id'] = $id;
// DB Content is fresher than http posted value.
- $this->db->query("select * from fm_tts_tickets where
id='$id'",__LINE__,__FILE__);
+ $this->db->query("SELECT * FROM fm_tts_tickets WHERE
id='$id'",__LINE__,__FILE__);
$this->db->next_record();
$location_code =
$this->db->f('location_code');
@@ -1120,24 +1120,43 @@
** M - Mail sent to vendor
*/
- $this->db->query("UPDATE fm_tts_tickets SET
publish_note = NULL WHERE id = {$id}",__LINE__,__FILE__);
- $this->db->query("UPDATE fm_tts_history SET publish =
NULL WHERE history_record_id = {$id}",__LINE__,__FILE__);
- if(isset($ticket['publish_note']))
+ if(!$simple)
{
- foreach ($ticket['publish_note'] as
$publish_info)
+ $this->db->query("UPDATE fm_tts_tickets SET
publish_note = NULL WHERE id = {$id}",__LINE__,__FILE__);
+ $this->db->query("UPDATE fm_tts_history SET
publish = NULL WHERE history_record_id = {$id}",__LINE__,__FILE__);
+ if(isset($ticket['publish_note']))
{
- $note = explode('_', $publish_info);
- if(!$note[1])
+ foreach ($ticket['publish_note'] as
$publish_info)
{
- $this->db->query("UPDATE
fm_tts_tickets SET publish_note = 1 WHERE id = {$note[0]}",__LINE__,__FILE__);
+ $note = explode('_',
$publish_info);
+ if(!$note[1])
+ {
+
$this->db->query("UPDATE fm_tts_tickets SET publish_note = 1 WHERE id =
{$note[0]}",__LINE__,__FILE__);
+ }
+ else
+ {
+
$this->db->query("UPDATE fm_tts_history SET publish = 1 WHERE history_id =
{$note[1]}",__LINE__,__FILE__);
+ }
}
- else
- {
- $this->db->query("UPDATE
fm_tts_history SET publish = 1 WHERE history_id =
{$note[1]}",__LINE__,__FILE__);
- }
}
}
+ if (($old_note != $ticket['note']) && $ticket['note'])
+ {
+ $this->fields_updated[] = 'note';
+
$this->historylog->add('C',$id,$ticket['note'],$old_note);
+ $_history_id =
$this->db->get_last_insert_id('fm_tts_history','history_id');
+ $this->db->query("UPDATE fm_tts_history SET
publish = 1 WHERE history_id = $_history_id",__LINE__,__FILE__);
+ unset($_history_id);
+ }
+
+ if (isset($this->fields_updated) &&
$this->fields_updated && $simple)
+ {
+ $receipt['message'][]= array('msg' =>
lang('Ticket1 has been updated'));
+ $this->db->transaction_commit();
+ return $receipt;
+ }
+
$finnish_date = (isset($ticket['finnish_date']) ?
phpgwapi_datetime::date_to_timestamp($ticket['finnish_date']):'');
if ($oldfinnish_date && isset($ticket['finnish_date'])
&& $ticket['finnish_date'])
@@ -1253,13 +1272,6 @@
$this->historylog->add('T',$id,$ticket['cat_id'],$oldcat_id);
}
- if ($old_budget != $ticket['budget'])
- {
- $this->fields_updated[] = 'budget';
- $this->db->query("UPDATE fm_tts_tickets set
budget='" . (int)$ticket['budget']
- . "' where id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('B',$id,$ticket['budget'],$old_budget);
- }
/*
if ($old_billable_rate != $ticket['billable_rate'])
{
@@ -1290,47 +1302,6 @@
$receipt['message'][]= array('msg' =>
lang('billable hours has been updated'));
}
- if ((int)$old_actual_cost !=
(int)$ticket['actual_cost'])
- {
- $this->db->query("UPDATE fm_tts_tickets SET
actual_cost='" . (float)$ticket['actual_cost']
- . "' WHERE id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('AC',$id,(float)$ticket['actual_cost'] ,
$old_actual_cost);
- $receipt['message'][]= array('msg' =>
lang('actual cost has been updated'));
- }
-
- if ((int)$old_order_cat_id !=
(int)$ticket['order_cat_id'])
- {
- $this->db->query("UPDATE fm_tts_tickets SET
order_cat_id='" . (int)$ticket['order_cat_id']
- . "' WHERE id='$id'",__LINE__,__FILE__);
- $receipt['message'][]= array('msg' =>
lang('order category has been updated'));
- $this->fields_updated[] = 'order_cat_id';
- }
-
- if ((int)$old_order_dim1 != (int)$ticket['order_dim1'])
- {
- $this->db->query("UPDATE fm_tts_tickets SET
order_dim1='" . (int)$ticket['order_dim1']
- . "' WHERE id='$id'",__LINE__,__FILE__);
- $receipt['message'][]= array('msg' =>
lang('order_dim1 has been updated'));
- $this->fields_updated[] = 'order_dim1';
- }
-
- if ($old_building_part != $ticket['building_part'])
- {
- $this->db->query("UPDATE fm_tts_tickets SET
building_part='" . $ticket['building_part']
- . "' WHERE id='$id'",__LINE__,__FILE__);
- $receipt['message'][]= array('msg' =>
lang('building part has been updated'));
- $this->fields_updated[] = 'building_part';
- }
-
- if (($old_note != $ticket['note']) && $ticket['note'])
- {
- $this->fields_updated[] = 'note';
-
$this->historylog->add('C',$id,$ticket['note'],$old_note);
- $_history_id =
$this->db->get_last_insert_id('fm_tts_history','history_id');
- $this->db->query("UPDATE fm_tts_history SET
publish = 1 WHERE history_id = $_history_id",__LINE__,__FILE__);
- unset($_history_id);
- }
-
if(isset($ticket['location']) && $ticket['location'])
{
$ticket['location_code'] = implode('-',
$ticket['location']);
@@ -1455,12 +1426,53 @@
if($order_add || $order_edit)
{
+ if ((int)$old_actual_cost !=
(int)$ticket['actual_cost'])
+ {
+ $this->db->query("UPDATE fm_tts_tickets
SET actual_cost='" . (float)$ticket['actual_cost']
+ . "' WHERE
id='$id'",__LINE__,__FILE__);
+
$this->historylog->add('AC',$id,(float)$ticket['actual_cost'] ,
$old_actual_cost);
+ $receipt['message'][]= array('msg' =>
lang('actual cost has been updated'));
+ }
+
+ if ((int)$old_order_cat_id !=
(int)$ticket['order_cat_id'])
+ {
+ $this->db->query("UPDATE fm_tts_tickets
SET order_cat_id='" . (int)$ticket['order_cat_id']
+ . "' WHERE
id='$id'",__LINE__,__FILE__);
+ $receipt['message'][]= array('msg' =>
lang('order category has been updated'));
+ $this->fields_updated[] =
'order_cat_id';
+ }
+
+ if ((int)$old_order_dim1 !=
(int)$ticket['order_dim1'])
+ {
+ $this->db->query("UPDATE fm_tts_tickets
SET order_dim1='" . (int)$ticket['order_dim1']
+ . "' WHERE
id='$id'",__LINE__,__FILE__);
+ $receipt['message'][]= array('msg' =>
lang('order_dim1 has been updated'));
+ $this->fields_updated[] = 'order_dim1';
+ }
+
+ if ($old_building_part !=
$ticket['building_part'])
+ {
+ $this->db->query("UPDATE fm_tts_tickets
SET building_part='" . $ticket['building_part']
+ . "' WHERE
id='$id'",__LINE__,__FILE__);
+ $receipt['message'][]= array('msg' =>
lang('building part has been updated'));
+ $this->fields_updated[] =
'building_part';
+ }
+
+ if ($old_budget != $ticket['budget'])
+ {
+ $this->fields_updated[] = 'budget';
+ $this->db->query("UPDATE fm_tts_tickets
set budget='" . (int)$ticket['budget']
+ . "' where
id='$id'",__LINE__,__FILE__);
+
$this->historylog->add('B',$id,$ticket['budget'],$old_budget);
+ }
+
$value_set['vendor_id'] =
$ticket['vendor_id'];
$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['budget'] =
$ticket['budget'];
+// $value_set['budget'] =
$ticket['budget'];
$value_set['branch_id'] =
$ticket['branch_id'];
+
}
$value_set =
$this->db->validate_update($value_set);
Modified: branches/Version-1_0-branch/property/inc/class.sowo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sowo_hour.inc.php
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/inc/class.sowo_hour.inc.php
2014-06-23 12:35:24 UTC (rev 12019)
@@ -471,10 +471,9 @@
if($hour['grouping_id'])
{
- $this->db->query("SELECT grouping_descr ,
max(record) as record FROM fm_wo_hours where grouping_id='"
.$hour['grouping_id'] . "' and workorder_id= '$workorder_id' GROUP by
grouping_descr",__LINE__,__FILE__);
+ $this->db->query("SELECT grouping_descr FROM
fm_wo_hours where grouping_id='" .$hour['grouping_id'] . "' and workorder_id=
'$workorder_id' GROUP by grouping_descr",__LINE__,__FILE__);
$this->db->next_record();
$hour['grouping_descr'] =
$this->db->f('grouping_descr');
-// $hour['record'] = $this->db->f('record')+1;
}
if($hour['new_grouping'])
@@ -490,7 +489,6 @@
$this->db->query("SELECT
max(grouping_id) as grouping_id FROM fm_wo_hours where workorder_id=
'$workorder_id'",__LINE__,__FILE__);
$this->db->next_record();
$hour['grouping_id'] =
$this->db->f('grouping_id')+1;
-// $hour['record'] = 1;
}
$hour['grouping_descr'] = $hour['new_grouping'];
@@ -503,6 +501,7 @@
//_debug
$values= array(
$this->account,
+ $hour['activity_num'],
$hour['descr'],
$hour['unit'],
$hour['cost'],
@@ -524,7 +523,7 @@
$values = $this->db->validate_insert($values);
- $this->db->query("insert into fm_wo_hours
(owner,hours_descr,unit,cost,quantity,billperae,ns3420_id,dim_d,"
+ $this->db->query("INSERT INTO fm_wo_hours
(owner,activity_num,hours_descr,unit,cost,quantity,billperae,ns3420_id,dim_d,"
. "
grouping_id,grouping_descr,record,building_part,tolerance,remark,entry_date,workorder_id,category,cat_per_cent)
"
. "VALUES ( $values )",__LINE__,__FILE__);
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2014-06-23 12:35:24 UTC (rev 12019)
@@ -58,7 +58,7 @@
/**
* @var boolean $_simple use simplified interface
*/
- protected $_simple = false;
+ protected $simple = false;
protected $_show_finnish_date = false;
protected $_category_acl = false;
var $part_of_town_id;
Modified: branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2014-06-23 12:35:24 UTC (rev 12019)
@@ -46,18 +46,19 @@
var $public_functions = array
(
- 'index' => true,
- 'tender' => true,
- 'view' => true,
- 'template' => true,
+ 'index' => true,
+ 'tender' => true,
+ 'view' => true,
+ 'template' => true,
'save_template' => true,
- 'prizebook' => true,
- 'add' => true,
- 'edit' => true,
- 'delete' => true,
- 'deviation' => true,
- 'edit_deviation'=> true,
- 'pdf_order' => true
+ 'prizebook' => true,
+ 'add' => true,
+ 'edit' => true,
+ 'delete' => true,
+ 'deviation' => true,
+ 'edit_deviation' => true,
+ 'pdf_order' => true,
+ 'import_calculation'=> true,
);
function property_uiwo_hour()
@@ -753,12 +754,19 @@
'value'
=> lang('Add from template')
),
array
- (
+ (
'type'
=> 'button',
'id'
=> 'btn_add_prizebook',
'tab_index' => 1,
'value'
=> lang('Add from prizebook')
- )
+ ),
+ array
+ (
+ 'type'
=> 'button',
+ 'id'
=> 'btn_import_calculation',
+
'tab_index' => 1,
+ 'value'
=> lang('import calculation')
+ )
),
'hidden_value' => array
(
@@ -971,6 +979,16 @@
$datatable['rowactions']['action_form'][] = array
(
+ 'my_name' =>
'import_calculation',
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uiwo_hour.import_calculation',
+ 'workorder_id' => $workorder_id
+ ))
+ );
+
+ $datatable['rowactions']['action_form'][] = array
+ (
'my_name' =>
'add_prizebook',
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
(
@@ -1195,6 +1213,9 @@
// Prepare YUI Library
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'wo_hour.index', 'property' );
+ $GLOBALS['phpgw']->js->validate_file( 'tinybox2',
'packed', 'phpgwapi' );
+
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
+
$this->save_sessiondata();
}
@@ -3478,4 +3499,164 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
+
+ function import_calculation()
+ {
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $workorder_id = phpgw::get_var('workorder_id');
+ if($_FILES)
+ {
+ $this->_import_calculation($workorder_id);
+
+ $bofiles =
CreateObject('property.bofiles');
+
+ $file_name = @str_replace('
','_',$_FILES['file']['name']);
+
+ $to_file =
"{$bofiles->fakebase}/workorder/{$workorder_id}/{$file_name}";
+
+ if($bofiles->vfs->file_exists(array(
+ 'string' => $to_file,
+ 'relatives' => Array(RELATIVE_NONE)
+ )))
+ {
+ phpgwapi_cache::message_set(lang('This
file already exists !'), 'error');
+ }
+ else
+ {
+
$bofiles->create_document_dir("workorder/{$workorder_id}");
+ $bofiles->vfs->override_acl = 1;
+
+ if(!$bofiles->vfs->cp(array (
+ 'from' =>
$_FILES['file']['tmp_name'],
+ 'to' => $to_file,
+ 'relatives' => array
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL))))
+ {
+
phpgwapi_cache::message_set(lang('Failed to upload file !'), 'error');
+ }
+ $bofiles->vfs->override_acl = 0;
+ }
+ }
+
+ if( $receipt = phpgwapi_cache::session_get('phpgwapi',
'phpgw_messages'))
+ {
+ phpgwapi_cache::session_clear('phpgwapi',
'phpgw_messages');
+ }
+
+ $data = array
+ (
+ 'redirect'
=> $redirect ? $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uiinvoice.list_sub', 'user_lid' => $user_lid, 'voucher_id' =>
$voucher_id, 'paid' => $paid)) : null,
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($receipt)),
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uiwo_hour.import_calculation')),
+ 'workorder_id' =>
$workorder_id
+ );
+
+ $GLOBALS['phpgw']->xslttpl->add_file('wo_hour');
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('import_calculation' => $data));
+ }
+
+ private function _import_calculation($workorder_id)
+ {
+ $error = false;
+
+ $data = array();
+ if(isset($_FILES['file']['tmp_name']) &&
$_FILES['file']['tmp_name'])
+ {
+ $file = array
+ (
+ 'name' => $_FILES['file']['tmp_name'],
+ 'type' => $_FILES['file']['type']
+ );
+ }
+ else
+ {
+ phpgwapi_cache::message_set('Ingen fil er
valgt', 'error');
+ return;
+ }
+
+ switch ($file['type'])
+ {
+ case
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+ case
'application/vnd.oasis.opendocument.spreadsheet':
+ case 'application/vnd.ms-excel':
+ $data =
$this->getexceldata($file['name']);
+ break;
+ default:
+ phpgwapi_cache::message_set("Not a
valid filetype: {$file['type']}", 'error');
+ $error = true;
+ }
+
+ if($data)
+ {
+ try
+ {
+ //Import
+ $this->bo->import_calculation($data,
$workorder_id);
+
+ }
+ catch (Exception $e)
+ {
+ if($e)
+ {
+
phpgwapi_cache::message_set($e->getMessage(), 'error');
+ $error = true;
+ }
+ }
+ }
+
+ if(!$error)
+ {
+ phpgwapi_cache::message_set(lang('workorder is
updated'), 'message');
+ }
+ }
+
+ protected function getexceldata($path)
+ {
+ phpgw::import_class('phpgwapi.phpexcel');
+
+ $inputFileType = PHPExcel_IOFactory::identify($path);
// Identify the type of file.
+ $objReader =
PHPExcel_IOFactory::createReader($inputFileType); // Create a reader of the
identified file type.
+ $worksheetNames = $objReader->listWorksheetNames($path);
+// _debug_array($worksheetNames);
+
+ $objPHPExcel = PHPExcel_IOFactory::load($path);
+
+ $result = array();
+
+ foreach($worksheetNames as $_index => $sheet_name)
+ {
+ $result[$_index]['name'] = $sheet_name;
+ $objPHPExcel->setActiveSheetIndex($_index);
+
+// $objWorksheet = $objPHPExcel->getActiveSheet();
+// _debug_array($objWorksheet->getTitle());
+
+ $highestColumm =
$objPHPExcel->getActiveSheet()->getHighestDataColumn();
+
+ $highestColumnIndex =
PHPExcel_Cell::columnIndexFromString($highestColumm);
+
+ $rows =
$objPHPExcel->getActiveSheet()->getHighestDataRow();
+
+ $start = 2; // Read the first line to get the
headers out of the way
+
+ for ($j=0; $j < $highestColumnIndex; $j++ )
+ {
+ $this->fields[] =
$objPHPExcel->getActiveSheet()->getCellByColumnAndRow($j,1)->getCalculatedValue();
+ }
+
+ $rows = $rows ? $rows +1 : 0;
+ for ($row=$start; $row < $rows; $row++ )
+ {
+ $_data = array();
+
+ for ($j=0; $j < $highestColumnIndex;
$j++ )
+ {
+ $_data[] =
$objPHPExcel->getActiveSheet()->getCellByColumnAndRow($j,$row)->getCalculatedValue();
+ }
+
+ $result[$_index]['data'][] = $_data;
+ }
+ }
+ return $result;
+ }
+
}
Modified: branches/Version-1_0-branch/property/js/yahoo/tts.index.simple.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/tts.index.simple.js
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/js/yahoo/tts.index.simple.js
2014-06-23 12:35:24 UTC (rev 12019)
@@ -30,19 +30,23 @@
{
date_search : 1 //if search has link "Data search"
}
+ var FormatterRight = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<P align=\"right\">"+oData+"</p>";
+ }
this.particular_setting = function()
{
if(flag_particular_setting=='init')
{
- //status
+ //status
index =
locate_in_array_options(0,"value",path_values.status_id);
- if(index)
- {
- oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
- }
+ if(index)
+ {
+ oMenuButton_0.set("label", ("<em>" +
array_options[0][index][1] + "</em>"));
+ }
// oMenuButton_0.focus();
- YAHOO.util.Dom.get(textImput[0].id).focus();
+ YAHOO.util.Dom.get(textImput[0].id).focus();
}
else if(flag_particular_setting=='update')
{
Modified: branches/Version-1_0-branch/property/js/yahoo/wo_hour.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/wo_hour.index.js
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/js/yahoo/wo_hour.index.js
2014-06-23 12:35:24 UTC (rev 12019)
@@ -16,14 +16,16 @@
]
// define buttons
- var
oNormalButton_0,oNormalButton_1,oNormalButton_2,oNormalButton_3,oNormalButton_4,oNormalButton_5;
+ var
oNormalButton_0,oNormalButton_1,oNormalButton_2,oNormalButton_3,oNormalButton_4,oNormalButton_5,oNormalButton_6;
var normalButtons = [
- {order:0, name:'btn_add_prizebook', funct:"onAddPrizebookClick"},
- {order:1, name:'btn_add_template', funct:"onAddTemplate"},
- {order:2, name:'btn_add_custom', funct:"onAddCustom"},
- {order:3, name:'btn_save_template', funct:"onSaveTemplate"},
- {order:4, name:'btn_print_preview', funct:"onPrintPreview"},
- {order:5, name:'btn_view_tender', funct:"onViewTender"}
+
+ {order:0, name:'btn_import_calculation',
funct:"onImportCalculationClick"},
+ {order:1, name:'btn_add_prizebook', funct:"onAddPrizebookClick"},
+ {order:2, name:'btn_add_template', funct:"onAddTemplate"},
+ {order:3, name:'btn_add_custom', funct:"onAddCustom"},
+ {order:4, name:'btn_save_template', funct:"onSaveTemplate"},
+ {order:5, name:'btn_print_preview', funct:"onPrintPreview"},
+ {order:6, name:'btn_view_tender', funct:"onViewTender"}
]
// define Text buttons
@@ -38,6 +40,24 @@
var div_footer, table, tableYUI ;
/****************************************************************************************/
+this.onImportCalculationClick = function()
+{
+ for(i=0;i<values_ds.rights_form.length;i++)
+ {
+ if(values_ds.rights_form[i].my_name ==
'import_calculation')
+ {
+ //NEW is always the last options in arrays
RIGHTS
+ sUrl = values_ds.rights_form[i].action;
+ //Convert all HTML entities to their applicable
characters
+ sUrl=html_entity_decode(sUrl);
+ TINY.box.show({iframe:sUrl,
boxid:'frameless',width:750,height:450,fixed:false,maskid:'darkmask',maskopacity:40,
mask:true, animate:true, close:
true,closejs:function(){parent.location.reload();}});
+ }
+ }
+}
+
+
+
+
this.onAddPrizebookClick = function()
{
for(i=0;i<values_ds.rights_form.length;i++)
@@ -539,9 +559,3 @@
}
});
-
-
-
-
-
-
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2014-06-23
12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2014-06-23
12:35:24 UTC (rev 12019)
@@ -894,6 +894,7 @@
if this entity type is to be linked to a location property no
Om denne entitetstypen skal linkes til en lokalisering
if this entity type is to be linked to documents property no
Om denne entitetstypen skal linkes til dokumentasjon
if this entity type is to look up tenants property no Om
denne entiteten skal gjøre oppslag på leietakere
+import calculation property no Importer kalkulasjon
import property no Import
importance property no Viktighet
import detail property no Importer detalj
Modified: branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2014-06-23 12:32:10 UTC (rev 12018)
+++ branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2014-06-23 12:35:24 UTC (rev 12019)
@@ -28,6 +28,9 @@
<xsl:when test="edit_deviation">
<xsl:apply-templates select="edit_deviation"/>
</xsl:when>
+ <xsl:when test="import_calculation">
+ <xsl:apply-templates
select="import_calculation"/>
+ </xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="list_hour"/>
</xsl:otherwise>
@@ -2690,3 +2693,53 @@
<xsl:value-of disable-output-escaping="yes"
select="name"/>
</option>
</xsl:template>
+
+ <!-- Import calculation -->
+
+ <xsl:template match="import_calculation" xmlns:php="http://php.net/xsl";>
+ <h2>
+ <xsl:value-of select="php:function('lang', 'upload file')"/>
+ </h2>
+ <form action="{form_action}" name="import_calculation_form"
id="split_voucher_form" method="post" ENCTYPE="multipart/form-data">
+ <br/>
+ <br/>
+ <input type="hidden" name="workorder_id" id="workorder_id"
value="{workorder_id}"/>
+
+ <table align = "center" valign = "center" width="95%">
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
+ <tr>
+ <td align="left"
colspan="2">
+
<xsl:call-template name="msgbox"/>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+
+ <tr>
+ <td>
+ <input type="file" id="file"
name="file" size="40">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="php:function('lang', 'Select file to upload')"/>
+ </xsl:attribute>
+ </input>
+ <!--
+ <xsl:variable
name="lang_template"><xsl:value-of select="php:function('lang', 'template')"
/></xsl:variable>
+ <input type="button" id =
"get_template" name="get_template" value="{$lang_template}" title =
"{$lang_template}" />
+ -->
+ </td>
+ <td >
+ <xsl:variable name="lang_submit">
+ <xsl:value-of
select="php:function('lang', 'upload file')"/>
+ </xsl:variable>
+ <input type="submit" name="submit"
value="{$lang_submit}">
+ <xsl:attribute name="title">
+ <xsl:value-of
select="$lang_submit"/>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </table>
+ </form>
+
+</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12019] Merge 12016:12018 from trunk,
Sigurd Nes <=