fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [12402] Merge 12398:12401 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [12402] Merge 12398:12401 from trunk
Date: Fri, 28 Nov 2014 15:27:04 +0000

Revision: 12402
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12402
Author:   sigurdne
Date:     2014-11-28 15:27:03 +0000 (Fri, 28 Nov 2014)
Log Message:
-----------
Merge 12398:12401 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/catch/inc/custom/default/pdf_18_1.php
    branches/Version-1_0-branch/catch/inc/custom/default/pdf_3_1.php
    branches/Version-1_0-branch/hrm/inc/class.uiuser.inc.php
    branches/Version-1_0-branch/property/inc/class.uientity.inc.php
    branches/Version-1_0-branch/property/inc/class.uiinvoice.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/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,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,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397
   + 
/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,12094-12095,12097,12099-12102,12104,12106-12107,12109-12182,12184-12201,12203-12210,12212-12231,12233-12239,12241-12248,12250-12328,12330-12363,12365-12384,12386-12397,12399-12401

Modified: branches/Version-1_0-branch/catch/inc/custom/default/pdf_18_1.php
===================================================================
--- branches/Version-1_0-branch/catch/inc/custom/default/pdf_18_1.php   
2014-11-28 15:25:33 UTC (rev 12401)
+++ branches/Version-1_0-branch/catch/inc/custom/default/pdf_18_1.php   
2014-11-28 15:27:03 UTC (rev 12402)
@@ -115,7 +115,7 @@
 
                        
$pdf->ezTable($data,array('col1'=>'','col2'=>'','col3'=>''),''
                                ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               ,'xOrientation'=>'right','width'=>500
+                               
,'xOrientation'=>'right','width'=>500,'gridlines'=> EZ_GRIDLINE_ALL
                                ,'cols'=>array
                                (
                                        
'col1'=>array('justification'=>'right','width'=>200, 'justification'=>'left'),
@@ -206,7 +206,7 @@
 
                        $pdf->ezTable($data,array('col1'=>'','col2'=>''),''
                                ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               
,'xOrientation'=>'right','width'=>500,'showLines'=> 0
+                               
,'xOrientation'=>'right','width'=>500,'gridlines'=> 0
                                ,'cols'=>array
                                (
                                        'col1' =>array('justification' => 
'right', 'width' => 250, 'justification' => 'left'),
@@ -228,4 +228,4 @@
 
                }
 
-       }
\ No newline at end of file
+       }

Modified: branches/Version-1_0-branch/catch/inc/custom/default/pdf_3_1.php
===================================================================
--- branches/Version-1_0-branch/catch/inc/custom/default/pdf_3_1.php    
2014-11-28 15:25:33 UTC (rev 12401)
+++ branches/Version-1_0-branch/catch/inc/custom/default/pdf_3_1.php    
2014-11-28 15:27:03 UTC (rev 12402)
@@ -122,7 +122,7 @@
 
                        
$pdf->ezTable($data,array('col1'=>'','col2'=>'','col3'=>''),''
                                ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               ,'xOrientation'=>'right','width'=>500
+                               
,'xOrientation'=>'right','width'=>500,'gridlines'=> EZ_GRIDLINE_ALL
                                ,'cols'=>array
                                (
                                        
'col1'=>array('justification'=>'right','width'=>200, 'justification'=>'left'),
@@ -213,7 +213,7 @@
 
                        $pdf->ezTable($data,array('col1'=>'','col2'=>''),''
                                ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               
,'xOrientation'=>'right','width'=>500,'showLines'=> 0
+                               
,'xOrientation'=>'right','width'=>500,'gridlines'=> 0
                                ,'cols'=>array
                                (
                                        'col1' =>array('justification' => 
'right', 'width' => 250, 'justification' => 'left'),
@@ -235,4 +235,4 @@
 
                }
 
-       }
\ No newline at end of file
+       }

Modified: branches/Version-1_0-branch/hrm/inc/class.uiuser.inc.php
===================================================================
--- branches/Version-1_0-branch/hrm/inc/class.uiuser.inc.php    2014-11-28 
15:25:33 UTC (rev 12401)
+++ branches/Version-1_0-branch/hrm/inc/class.uiuser.inc.php    2014-11-28 
15:27:03 UTC (rev 12402)
@@ -811,7 +811,7 @@
                        $pdf->ezStartPageNumbers(500,28,10,'right','{PAGENUM} ' 
. lang('of') . ' {TOTALPAGENUM}',1);
 
                        $pdf->ezTable($content_heading,'','',
-                                                       
array('xPos'=>220,'xOrientation'=>'right','width'=>300,0,'shaded'=>0,'fontSize' 
=> 10,'showLines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>0,'showHeadings'=>0
+                                                       
array('xPos'=>220,'xOrientation'=>'right','width'=>300,0,'shaded'=>0,'fontSize' 
=> 10,'gridlines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>0,'showHeadings'=>0
                                                        
,'cols'=>array('text'=>array('justification'=>'left','width'=>100),
                                                                        
'value'=>array('justification'=>'left','width'=>200))
                                                        )
@@ -841,7 +841,7 @@
                                        );
                                        $pdf->ezSetDy(-20);
                                        $pdf->ezTable($content,'','',
-                                                       
array('xPos'=>50,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 12,'showLines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>2,'showHeadings'=>0
+                                                       
array('xPos'=>50,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 12,'gridlines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>2,'showHeadings'=>0
                                                        ,'cols'=>$table_header
                                                        )
                                                );
@@ -869,7 +869,7 @@
                                );
 
                                $pdf->ezTable($content,'','',
-                                                       
array('xPos'=>50,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 10,'showLines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>2,'showHeadings'=>0
+                                                       
array('xPos'=>50,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 10,'gridlines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>2,'showHeadings'=>0
                                                        ,'cols'=>$table_header
                                                        )
                                                );

Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php     
2014-11-28 15:25:33 UTC (rev 12401)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php     
2014-11-28 15:27:03 UTC (rev 12402)
@@ -3049,7 +3049,7 @@
                        $pdf->ezStartPageNumbers(500,28,10,'right','{PAGENUM} ' 
. lang('of') . ' {TOTALPAGENUM}',1);
 
                        $pdf->ezTable($content_heading,'','',
-                               
array('xPos'=>220,'xOrientation'=>'right','width'=>300,0,'shaded'=>0,'fontSize' 
=> 10,'showLines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>0,'showHeadings'=>0
+                               
array('xPos'=>220,'xOrientation'=>'right','width'=>300,0,'shaded'=>0,'fontSize' 
=> 10, 'gridlines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>0,'showHeadings'=>0
                                
,'cols'=>array('text'=>array('justification'=>'left','width'=>100),
                                        
'value'=>array('justification'=>'left','width'=>200))
                                )
@@ -3140,7 +3140,7 @@
                                        }
                                }
                                $pdf->ezTable($content,'','',
-                                       
array('xPos'=>50,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 10,'showLines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>2,'showHeadings'=>0
+                                       
array('xPos'=>50,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 10,'gridlines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>2,'showHeadings'=>0
                                        ,'cols'=>$table_header
                                )
                        );

Modified: branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php    
2014-11-28 15:25:33 UTC (rev 12401)
+++ branches/Version-1_0-branch/property/inc/class.uiinvoice.inc.php    
2014-11-28 15:27:03 UTC (rev 12402)
@@ -3699,7 +3699,7 @@
                                );
 
                        $pdf->ezTable($content_heading,'','',
-                               
array('xPos'=>70,'xOrientation'=>'right','width'=>400,0,'shaded'=>0,'fontSize' 
=> 8,'showLines'=> 0,'titleFontSize' => 
12,'outerLineThickness'=>0,'showHeadings'=>0
+                               
array('xPos'=>70,'xOrientation'=>'right','width'=>400,0,'shaded'=>0,'fontSize' 
=> 8,'gridlines' => 0,'titleFontSize' => 
12,'outerLineThickness'=>0,'showHeadings'=>0
                                
,'cols'=>array('text'=>array('justification'=>'left','width'=>100),
                                        
'value'=>array('justification'=>'left','width'=>200))
                                )
@@ -3722,7 +3722,7 @@
                        if(is_array($values))
                        {
                                $pdf->ezTable($content,'','',
-                                       
array('xPos'=>70,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 8,'showLines'=> 2,'titleFontSize' => 12,'outerLineThickness'=>2
+                                       
array('xPos'=>70,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 8,'gridlines' => EZ_GRIDLINE_ALL,'titleFontSize' => 
12,'outerLineThickness'=>2
                                        ,'cols'=>$table_header
                                )
                        );

Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php        
2014-11-28 15:25:33 UTC (rev 12401)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php        
2014-11-28 15:27:03 UTC (rev 12402)
@@ -3840,10 +3840,10 @@
                                
array('col1'=>"{$this->bo->config->config_data['org_name']}\n\nOrg.nr: 
{$this->bo->config->config_data['org_unit_id']}",'col2'=>lang('Order'),'col3'=>lang('order
 id') . "\n\n{$ticket['order_id']}")
                        );              
 
-                       
$pdf->ezTable($data,array('col1'=>'','col2'=>'','col3'=>''),''
-                               ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               ,'xOrientation'=>'right','width'=>500
-                               ,'cols'=>array
+                       
$pdf->ezTable($data,array('col1'=>'','col2'=>'','col3'=>''),'',
+                               array('showHeadings'=>0,'shaded'=>0,'xPos'=>0,
+                               'xOrientation'=>'right','width'=>500, 
'gridlines'=> EZ_GRIDLINE_ALL,
+                               'cols'=>array
                                (
                                        
'col1'=>array('justification'=>'right','width'=>200, 'justification'=>'left'),
                                        
'col2'=>array('justification'=>'right','width'=>100, 'justification'=>'center'),
@@ -3922,10 +3922,10 @@
                                array('col1'=>$from,'col2'=>$invoice_address)
                        );              
 
-                       $pdf->ezTable($data,array('col1'=>'','col2'=>''),''
-                               ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               
,'xOrientation'=>'right','width'=>500,'showLines'=> 2
-                               ,'cols'=>array
+                       $pdf->ezTable($data,array('col1'=>'','col2'=>''),'',
+                               array('showHeadings'=>0,'shaded'=>0,'xPos'=>0,
+                               
'xOrientation'=>'right','width'=>500,'gridlines'=> EZ_GRIDLINE_ALL,
+                               'cols'=>array
                                (
                                        
'col1'=>array('justification'=>'right','width'=>250, 'justification'=>'left'),
                                        
'col2'=>array('justification'=>'right','width'=>250, 'justification'=>'left'),
@@ -3975,7 +3975,7 @@
                        {
                                $pdf->ezSetDy(-20);
                                $pdf->ezTable($content,'',lang('details'),
-                                       
array('xPos'=>0,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 8,'showLines'=> 2,'titleFontSize' => 12,'outerLineThickness'=>2
+                                       
array('xPos'=>0,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 8,'gridlines'=> EZ_GRIDLINE_ALL,'titleFontSize' => 12,'outerLineThickness'=>2
                                        ,'cols'=>array(
                                                lang('bill per 
unit')=>array('justification'=>'right','width'=>50)
                                                
,lang('quantity')=>array('justification'=>'right','width'=>50)

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-11-28 15:25:33 UTC (rev 12401)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php    
2014-11-28 15:27:03 UTC (rev 12402)
@@ -1851,15 +1851,13 @@
                                                                                
                                                        'show_details'  => 
$show_details,
                                                                                
                                                        'print'                 
=> true
                                                                                
                                                        )) . "','1000','1200')",
-                                       'pdf_action'                            
                => "javascript:openwindow('"
-                                                                               
                                        . $GLOBALS['phpgw']->link('/index.php', 
array
+                                       'pdf_action'                            
                => $GLOBALS['phpgw']->link('/index.php', array
                                                                                
                                                (
                                                                                
                                                        'menuaction'    => 
'property.uiwo_hour.pdf_order',
                                                                                
                                                        'workorder_id'  => 
$workorder_id,
                                                                                
                                                        'show_cost'             
=> $show_cost,
                                                                                
                                                        'show_details'  => 
$show_details,
-                                                                               
                                                        'preview'               
=> true,
-                                                                               
                                                        )) . "','100','100')",
+                                                                               
                                                        'preview'               
=> true)),
                                        'mail_recipients'                       
                => isset($workorder['mail_recipients']) && 
is_array($workorder['mail_recipients']) ? implode(';', 
$workorder['mail_recipients']) : ''
                                );
 
@@ -1954,8 +1952,6 @@
 
                function pdf_order($workorder_id = '', $show_cost = false)
                {
-                       $pdf                                    = 
CreateObject('phpgwapi.pdf');
-
                        if(!$this->acl_read)
                        {
                                
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=> 
'property.uilocation.stop', 'perm'=>1, 'acl_location'=> $this->acl_location));
@@ -2010,9 +2006,10 @@
                        $date = 
$GLOBALS['phpgw']->common->show_date(time(),$dateformat);
 
                        set_time_limit(1800);
-                       $pdf -> ezSetMargins(50,70,50,50);
-                       $pdf->selectFont(PHPGW_API_INC . 
'/pdf/fonts/Helvetica.afm');
 
+                       $pdf= CreateObject('phpgwapi.pdf');
+                       $pdf->ezSetMargins(50,70,50,50);
+
                        // put a line top and bottom on all the pages
                        $all = $pdf->openObject();
                        $pdf->saveState();
@@ -2031,16 +2028,17 @@
                        //      $pdf->addText(50,823,6,lang('order'));
                        
$pdf->addText(50,28,6,$this->config->config_data['org_name']);
                        $pdf->addText(300,28,6,$date);
-
-
                        $pdf->restoreState();
                        $pdf->closeObject();
                        // note that object can be told to appear on just odd 
or even pages by changing 'all' to 'odd'
                        // or 'even'.
                        $pdf->addObject($all,'all');
 
-                       //                      $pdf->ezSetDy(-100);
+                       $pdf->selectFont(PHPGW_API_INC . 
'/pdf/fonts/Helvetica.afm');
 
+//                     $pdf->ezSetDy(-100);
+                       $pdf->openHere('Fit');
+
                        $pdf->ezStartPageNumbers(500,28,6,'right','{PAGENUM} ' 
. lang('of') . ' {TOTALPAGENUM}',1);
 
                        $data = array
@@ -2048,14 +2046,18 @@
                                        
array('col1'=>"{$this->config->config_data['org_name']}\n\nOrg.nr: 
{$this->config->config_data['org_unit_id']}",'col2'=>lang('Order'),'col3'=>lang('order
 id') . "\n\n{$workorder_id}")
                                );              
 
-                       
$pdf->ezTable($data,array('col1'=>'','col2'=>'','col3'=>''),''
-                               ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               ,'xOrientation'=>'right','width'=>500
-                               ,'cols'=>array
+                       
$pdf->ezTable($data,array('col1'=>'','col2'=>'','col3'=>''),'',
+                               array('showHeadings'=>0,'shaded'=>0,'xPos'=>0,
+                               'xOrientation'=>'right','width'=>500,
+                               'gridlines'     => EZ_GRIDLINE_ALL,
+                               //'outerLineThickness'=>1,
+                               //'innerLineThickness'=> 1,
+                               //      'showLines'     => 0,
+                               'cols'=>array
                                (
-                                       
'col1'=>array('justification'=>'right','width'=>200, 'justification'=>'left'),
-                                       
'col2'=>array('justification'=>'right','width'=>100, 'justification'=>'center'),
-                                       
'col3'=>array('justification'=>'right','width'=>200),
+                                       'col1'=>array('width'=>200, 
'justification'=>'left'),
+                                       'col2'=>array('width'=>100, 
'justification'=>'center'),
+                                       
'col3'=>array('width'=>200,'justification'=>'right'),
                                )
 
                        ));
@@ -2094,9 +2096,9 @@
                                );              
 
                        $pdf->ezTable($data,array('col1'=>'','col2'=>''),''
-                               ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               
,'xOrientation'=>'right','width'=>500,'showLines'=> 2
-                               ,'cols'=>array
+                               ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0,
+                               
'xOrientation'=>'right','width'=>500,'gridlines'=> EZ_GRIDLINE_ALL,
+                               'cols'=>array
                                (
                                        
'col1'=>array('justification'=>'right','width'=>250, 'justification'=>'left'),
                                        
'col2'=>array('justification'=>'right','width'=>250, 'justification'=>'left'),
@@ -2115,8 +2117,9 @@
                        {
                                $pdf->ezSetDy(-20);
                                $pdf->ezTable($content,'',lang('details'),
-                                       
array('xPos'=>0,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 8,'showLines'=> 2,'titleFontSize' => 12,'outerLineThickness'=>2
-                                       ,'cols'=>array(
+                                       
array('xPos'=>0,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 8,
+                                               'gridlines'     => 
EZ_GRIDLINE_ALL,
+                                               'titleFontSize' => 
12,'outerLineThickness'=>1,'cols'=>array(
                                                lang('bill per 
unit')=>array('justification'=>'right','width'=>50)
                                                
,lang('quantity')=>array('justification'=>'right','width'=>50)
                                                
,lang('cost')=>array('justification'=>'right','width'=>50)
@@ -2132,28 +2135,27 @@
                        $filename = 
$GLOBALS['phpgw_info']['server']['temp_dir'].'/'.md5($code_text).'.png';
                        QRcode::png($code_text,$filename);
                        $pdf->ezSetDy(-20);
-                       $pdf->ezImage($filename,$pad = 0,$width = 0,$resize = 
'',$just = 'left',$border = '');
-                       $pdf->ezText(lang('status code') .': 1 => ' . 
lang('performed'). ', 2 => ' . lang('No access') . ', 3 => I arbeid',10);
+       //              $pdf->ezImage($filename,$pad = 0,$width = 0,$resize = 
'',$just = 'left',$border = '');
+       //              $pdf->ezText(lang('status code') .': 1 => ' . 
lang('performed'). ', 2 => ' . lang('No access') . ', 3 => I arbeid',10);
 
-               /* TODO: Library has to be 
updated..http://sourceforge.net/projects/pdf-php/?source=directory
                        $data = array(
-                               array('col1'=>"<C:showimage:{$filename} 90>"),
-                               array('col1'=>'','col2'=>lang('status code') 
.': 1 => ' . lang('performed'). ', 2 => ' . lang('No access') . ', 3 => I 
arbeid')
+                               array('col1'=>"<C:showimage:{$filename} 90>", 
'col2'=>"\n".lang('status code') .":\n\n 1 => " . lang('performed'). "\n 2 => " 
. lang('No access') . "\n 3 => I arbeid")
                        );
 
 
-                               
$pdf->ezTable($data,array('col1'=>'','col2'=>''),''
-                               ,array('showHeadings'=>0,'shaded'=>0,'xPos'=>0
-                               
,'xOrientation'=>'right','width'=>500,'showLines'=> 2
-                               ,'cols'=>array
+                               
$pdf->ezTable($data,array('col1'=>'','col2'=>''),'',
+                               array('showHeadings'=>0,'shaded'=>0,'xPos'=>0,
+                               'xOrientation'=>'right','width'=>500,
+                               'gridlines'     => EZ_GRIDLINE_ALL,
+                               'cols'=>array
                                (
-                                       
'col1'=>array('justification'=>'right','width'=>250, 'justification'=>'left'),
-                                       
'col2'=>array('justification'=>'right','width'=>250, 'justification'=>'left'),
+                                       'col1'=>array('width'=>150, 
'justification'=>'left'),
+                                       'col2'=>array('width'=>350, 
'justification'=>'left'),
                                )
 
                        ));
-*/
 
+
                        
if(isset($this->config->config_data['order_footer_header']) && 
$this->config->config_data['order_footer_header'])
                        {
                                if(!$content)
@@ -2164,14 +2166,14 @@
                                
$pdf->ezText($this->config->config_data['order_footer'],10);
                        }
 
-                       $document= $pdf->ezOutput();
                        if($preview)
                        {
-                               $pdf->print_pdf($document,'order');
+                       //      $pdf->print_pdf($document,'order');
+                               $pdf->ezStream();
                        }
                        else
                        {
-                               return $document;
+                               return $pdf->ezOutput();
                        }
                }
 
@@ -2243,8 +2245,9 @@
                        {
                                $pdf->ezNewPage();
                                $pdf->ezTable($content,'',$project['name'],
-                                       
array('xPos'=>70,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 8,'showLines'=> 2,'titleFontSize' => 12,'outerLineThickness'=>2
-                                       ,'cols'=>array(
+                                       
array('xPos'=>70,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize' 
=> 8,
+                                       'gridlines'     => 
EZ_GRIDLINE_ALL,'titleFontSize' => 12,'outerLineThickness'=>2,
+                                       'cols'=>array(
                                                lang('bill per 
unit')=>array('justification'=>'right','width'=>50)
                                                
,lang('quantity')=>array('justification'=>'right','width'=>50)
                                                
,lang('cost')=>array('justification'=>'right','width'=>50)

Modified: branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/wo_hour.xsl     
2014-11-28 15:25:33 UTC (rev 12401)
+++ branches/Version-1_0-branch/property/templates/base/wo_hour.xsl     
2014-11-28 15:27:03 UTC (rev 12402)
@@ -405,7 +405,7 @@
                                                                        </tr>
                                                                        <tr>
                                                                                
<td class="th_text" align="left">
-                                                                               
        <a href="{pdf_action}">
+                                                                               
        <a href="{pdf_action}" target="_blank">
                                                                                
                <xsl:attribute name="title">
                                                                                
                        <xsl:value-of select="php:function('lang', 'preview 
pdf')"/>
                                                                                
                </xsl:attribute>




reply via email to

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