[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11900] Merge 11896:11899 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11900] Merge 11896:11899 from trunk |
|
Date: |
Thu, 10 Apr 2014 08:52:46 +0000 |
Revision: 11900
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11900
Author: sigurdne
Date: 2014-04-10 08:52:46 +0000 (Thu, 10 Apr 2014)
Log Message:
-----------
Merge 11896:11899 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/bim/setup/setup.inc.php
branches/Version-1_0-branch/bim/setup/tables_current.inc.php
branches/Version-1_0-branch/bim/setup/tables_update.inc.php
branches/Version-1_0-branch/catch/setup/setup.inc.php
branches/Version-1_0-branch/catch/setup/tables_update.inc.php
branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
branches/Version-1_0-branch/header.inc.php.template
branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
branches/Version-1_0-branch/property/inc/class.boentity.inc.php
branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.menu.inc.php
branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
branches/Version-1_0-branch/property/inc/class.uientity.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
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/admin_entity.xsl
branches/Version-1_0-branch/property/templates/base/entity.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
+
/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
Modified: branches/Version-1_0-branch/bim/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/bim/setup/setup.inc.php 2014-04-10 08:48:17 UTC
(rev 11899)
+++ branches/Version-1_0-branch/bim/setup/setup.inc.php 2014-04-10 08:52:46 UTC
(rev 11900)
@@ -12,7 +12,7 @@
*/
$setup_info['bim']['name'] = 'bim';
- $setup_info['bim']['version'] = '0.9.17.507';
+ $setup_info['bim']['version'] = '0.9.17.508';
$setup_info['bim']['app_order'] = 8;
$setup_info['bim']['enable'] = 1;
$setup_info['bim']['app_group'] = 'office';
Modified: branches/Version-1_0-branch/bim/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/bim/setup/tables_current.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/bim/setup/tables_current.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -60,7 +60,7 @@
'address' => array('type' =>
'varchar','precision' => '150','nullable' => True),
'entry_date' => array('type' =>
'int','precision' => '4','nullable' => True),
'user_id' => array('type' => 'int','precision'
=> '4','nullable' => True),
- 'department_id' => array('type' =>
'int','precision' => '4','nullable' => True),
+ 'org_unit_id' => array('type' =>
'int','precision' => '4','nullable' => True),
),
'pk' => array('type','id'),
'fk' => array(
Modified: branches/Version-1_0-branch/bim/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/bim/setup/tables_update.inc.php 2014-04-10
08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/bim/setup/tables_update.inc.php 2014-04-10
08:52:46 UTC (rev 11900)
@@ -183,3 +183,20 @@
return $GLOBALS['setup_info']['bim']['currentver'];
}
}
+
+ /**
+ * Update bim version from 0.9.17.507 to 0.9.17.508
+ */
+ $test[] = '0.9.17.507';
+ function bim_upgrade0_9_17_507()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('fm_bim_item','department_id','org_unit_id');
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['bim']['currentver'] =
'0.9.17.508';
+ return $GLOBALS['setup_info']['bim']['currentver'];
+ }
+ }
\ No newline at end of file
Modified: branches/Version-1_0-branch/catch/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/catch/setup/setup.inc.php 2014-04-10
08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/catch/setup/setup.inc.php 2014-04-10
08:52:46 UTC (rev 11900)
@@ -27,7 +27,7 @@
*/
$setup_info['catch']['name'] = 'catch';
- $setup_info['catch']['version'] = '0.9.17.517';
+ $setup_info['catch']['version'] = '0.9.17.518';
$setup_info['catch']['app_order'] = 20;
$setup_info['catch']['enable'] = 1;
$setup_info['catch']['globals_checked'] = True;
Modified: branches/Version-1_0-branch/catch/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/catch/setup/tables_update.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/catch/setup/tables_update.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -546,3 +546,45 @@
}
}
+ /**
+ * Update catch version from 0.9.17.517 to 0.9.17.518
+ * Change name from department to org_unit
+ */
+ $test[] = '0.9.17.517';
+ function catch_upgrade0_9_17_517()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT * FROM
fm_catch_category");
+
+ $categories = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $categories[] = array
+ (
+ 'entity_id' =>
$GLOBALS['phpgw_setup']->oProc->f('entity_id'),
+ 'cat_id' =>
$GLOBALS['phpgw_setup']->oProc->f('id')
+ );
+ }
+
+ $tables = $GLOBALS['phpgw_setup']->oProc->m_odb->table_names();
+
+ foreach ($categories as $category)
+ {
+ $table =
"fm_catch_{$category['entity_id']}_{$category['cat_id']}";
+ if(in_array($table, $tables))
+ {
+ $metadata =
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata($table);
+ if(isset($metadata['department_id']))
+ {
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn($table,'department_id','org_unit_id');
+ }
+ }
+ }
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['catch']['currentver'] =
'0.9.17.518';
+ return $GLOBALS['setup_info']['catch']['currentver'];
+ }
+ }
\ No newline at end of file
Modified: branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/frontend/inc/class.uientity.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -102,6 +102,27 @@
parent::__construct();
$this->location_code =
$this->header_state['selected_location'];
$this->bo->location_code = $this->location_code;
+
+ $_org_units = array();
+ if(is_array($this->header_state['org_unit']))
+ {
+ foreach ($this->header_state['org_unit'] as
$org_unit)
+ {
+ $_org_unit_id =
(int)$org_unit['ORG_UNIT_ID'];
+ $_subs =
execMethod('property.sogeneric.read_tree',array('node_id' => $_org_unit_id,
'type' => 'department'));
+ $_org_units[$_org_unit_id] = true;
+ foreach($_subs as $entry)
+ {
+ $_org_units[$entry['id']] =
true;
+ }
+ }
+ }
+ $org_units = array_keys($_org_units);
+ _debug_array($this->header_state['org_unit']);
+ _debug_array($org_units);
+
+ die();
+
}
Modified: branches/Version-1_0-branch/header.inc.php.template
===================================================================
--- branches/Version-1_0-branch/header.inc.php.template 2014-04-10 08:48:17 UTC
(rev 11899)
+++ branches/Version-1_0-branch/header.inc.php.template 2014-04-10 08:52:46 UTC
(rev 11900)
@@ -249,7 +249,7 @@
* @global string $phpgw_info['server']['versions']['header']
* Version of this header file
*/
- $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.32';
+ $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.31';
if ( !isset($GLOBALS['phpgw_info']['flags']['noapi'])
Modified: branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -81,7 +81,7 @@
$filter =
phpgw::get_var('filter', 'int');
$cat_id =
phpgw::get_var('cat_id', 'int');
$dimb_id =
phpgw::get_var('dimb_id', 'int');
- $department =
phpgw::get_var('department', 'int');
+ $org_unit_id =
phpgw::get_var('org_unit_id', 'int');
$allrows =
phpgw::get_var('allrows', 'bool');
$district_id =
phpgw::get_var('district_id', 'int');
$year =
phpgw::get_var('year', 'int');
@@ -105,7 +105,7 @@
$this->order = isset($order) &&
$order ? $order : '';
$this->cat_id = isset($cat_id) &&
$cat_id ? $cat_id : '';
$this->dimb_id = isset($dimb_id) &&
$dimb_id ? $dimb_id :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['dimb'];
- $this->department = isset($department) &&
$department ? $department :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['department'];
+ $this->org_unit_id = isset($org_unit_id)
&& $org_unit_id ? $org_unit_id :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['org_unit_id'];
$this->part_of_town_id = isset($part_of_town_id) &&
$part_of_town_id ? $part_of_town_id : '';
$this->district_id = isset($district_id)
&& $district_id ? $district_id : '';
@@ -157,7 +157,7 @@
$budget = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,
'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,
- 'cat_id' => $this->cat_id, 'dimb_id' =>
$this->dimb_id, 'department' => $this->department));
+ 'cat_id' => $this->cat_id, 'dimb_id' =>
$this->dimb_id, 'org_unit_id' => $this->org_unit_id));
$this->total_records =
$this->so->total_records;
$this->sum_budget_cost =
$this->so->sum_budget_cost;
@@ -194,7 +194,7 @@
'sort' => strtoupper($this->sort), 'order' =>
$this->order, 'filter' => $this->filter,
'cat_id' => $this->cat_id,
'allrows'=>$this->allrows, 'district_id' => $this->district_id,
'year' => $this->year,'month' => $this->month,
'grouping' => $this->grouping, 'revision' => $this->revision,
- 'details' => $this->details,'dimb_id' =>
$this->dimb_id, 'department' => $this->department,
+ 'details' => $this->details,'dimb_id' =>
$this->dimb_id, 'org_unit_id' => $this->org_unit_id,
'direction' => $this->direction));
$this->total_records =
$this->so->total_records;
Modified: branches/Version-1_0-branch/property/inc/class.boentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.boentity.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -493,19 +493,19 @@
}
$values = $this->custom->prepare($values,
$this->type_app[$this->type],".{$this->type}.{$data['entity_id']}.{$data['cat_id']}",
$data['view']);
- if($values['department_id'])
+ if($values['org_unit_id'])
{
$bogeneric =
CreateObject('property.sogeneric');
- $bogeneric->get_location_info('department');
- $department =
$bogeneric->read_single(array('id' => $values['department_id']));
- $values['department_name'] =
$department['name'];
- $values['department_name_path'] =
$department['name'];
- if($department['parent_id'])
+ $bogeneric->get_location_info('org_unit');
+ $org_unit = $bogeneric->read_single(array('id'
=> $values['org_unit_id']));
+ $values['org_unit_name'] = $org_unit['name'];
+ $values['org_unit_name_path'] =
$org_unit['name'];
+ if($org_unit['parent_id'])
{
- $path =
$bogeneric->get_path(array('type' => 'department', 'id' =>
$department['parent_id']));
+ $path =
$bogeneric->get_path(array('type' => 'org_unit', 'id' =>
$org_unit['parent_id']));
if($path)
{
- $values['department_name_path']
.= '::' . implode(' > ', $path);
+ $values['org_unit_name_path']
.= '::' . implode(' > ', $path);
}
}
}
Modified: branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.bogeneric.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -322,6 +322,10 @@
return $history_type;
}
+ /**
+ * Fetch data to populate autocomplete from forms
+ * @return array result to be handled by javascript
+ */
function get_autocomplete()
{
$this->get_location_info();
Modified: branches/Version-1_0-branch/property/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.menu.inc.php 2014-04-10
08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.menu.inc.php 2014-04-10
08:52:46 UTC (rev 11900)
@@ -206,10 +206,10 @@
'text' => lang('budget
account'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'budget_account') )
),
- 'department' => array
+ 'org_unit' => array
(
'text' =>
lang('department'),
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'department') )
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'org_unit') )
),
'accounting_dimb' => array
(
Modified: branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -453,7 +453,7 @@
'parent_id'
=> $this->db->f('parent_id'),
'level'
=> $this->db->f('level'),
'location_id'
=> $this->db->f('location_id'),
- 'department'
=> $this->db->f('department')
+ 'org_unit'
=> $this->db->f('org_unit')
);
}
@@ -580,7 +580,7 @@
$fd['entry_date'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => true);
$fd['user_id'] = array('type' => 'int', 'precision' =>
4, 'nullable' => true);
- $fd['department_id'] = array('type' => 'int',
'precision' => 4, 'nullable' => true);
+ $fd['org_unit_id'] = array('type' => 'int', 'precision'
=> 4, 'nullable' => true);
return $fd;
}
@@ -630,13 +630,13 @@
$values['enable_bulk'],
$values['jasperupload'],
$values['parent_id'],
- $values['department'],
+ $values['org_unit'],
$level
);
$values_insert =
$this->db->validate_insert($values_insert);
- $this->db->query("INSERT INTO {$table}
(location_id,entity_id,id,name,
descr,prefix,lookup_tenant,tracking,location_level,location_link_level,fileupload,loc_link,start_project,start_ticket,is_eav,enable_bulk,jasperupload,parent_id,department,level
) "
+ $this->db->query("INSERT INTO {$table}
(location_id,entity_id,id,name,
descr,prefix,lookup_tenant,tracking,location_level,location_link_level,fileupload,loc_link,start_project,start_ticket,is_eav,enable_bulk,jasperupload,parent_id,org_unit,level
) "
. "VALUES ($values_insert)",__LINE__,__FILE__);
@@ -853,7 +853,7 @@
'jasperupload'
=> $entity['jasperupload'],
'parent_id'
=> $entity['parent_id'],
'level'
=> $level,
- 'department'
=> $entity['department']
+ 'org_unit'
=> $entity['org_unit']
);
$value_set =
$this->db->validate_update($value_set);
Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -534,7 +534,7 @@
$cat_id = isset($data['cat_id']) ?
$data['cat_id'] : '';
$details = isset($data['details']) ?
$data['details'] : '';
$dimb_id = isset($data['dimb_id']) &&
$data['dimb_id'] ? (int)$data['dimb_id'] : 0;
- $department = isset($data['department'])
&& $data['department'] ? (int)$data['department'] : 0;
+ $org_unit_id = isset($data['org_unit_id']) &&
$data['org_unit_id'] ? (int)$data['org_unit_id'] : 0;
$direction = isset($data['direction']) &&
$data['direction'] ? $data['direction'] : 'expenses';
if(!$year)
@@ -595,20 +595,20 @@
$where = 'AND';
}
- $_department_dimb = array();
- if ($department > 0)
+ $_org_unit_dimb = array();
+ if ($org_unit_id > 0)
{
- $_department_dimb[] = -1;//block in case no one
found
- $this->db->query("SELECT id FROM fm_ecodimb
WHERE department = $department ",__LINE__,__FILE__);
+ $_org_unit_dimb[] = -1;//block in case no one
found
+ $this->db->query("SELECT id FROM fm_ecodimb
WHERE org_unit_id = $org_unit_id ",__LINE__,__FILE__);
while ($this->db->next_record())
{
- $_department_dimb[] =
$this->db->f('id');
+ $_org_unit_dimb[] = $this->db->f('id');
}
}
- if($_department_dimb)
+ if($_org_unit_dimb)
{
- $filtermethod .= " $where fm_project.ecodimb IN
(" . implode(',', $_department_dimb) . ')';
+ $filtermethod .= " $where fm_project.ecodimb IN
(" . implode(',', $_org_unit_dimb) . ')';
$where = 'AND';
}
@@ -781,9 +781,9 @@
$where = 'AND';
}
- if($_department_dimb)
+ if($_org_unit_dimb)
{
- $filtermethod .= " $where
fm_tts_tickets.ecodimb IN (" . implode(',', $_department_dimb) . ')';
+ $filtermethod .= " $where
fm_tts_tickets.ecodimb IN (" . implode(',', $_org_unit_dimb) . ')';
$where = 'AND';
}
@@ -886,9 +886,9 @@
$where = 'AND';
}
- if($_department_dimb)
+ if($_org_unit_dimb)
{
- $filtermethod .= " $where ecodimb IN (" .
implode(',', $_department_dimb) . ')';
+ $filtermethod .= " $where ecodimb IN (" .
implode(',', $_org_unit_dimb) . ')';
$where = 'AND';
}
@@ -946,9 +946,9 @@
$where = 'AND';
}
- if($_department_dimb)
+ if($_org_unit_dimb)
{
- $filtermethod .= " $where
fm_s_agreement_budget.ecodimb IN (" . implode(',', $_department_dimb) . ')';
+ $filtermethod .= " $where
fm_s_agreement_budget.ecodimb IN (" . implode(',', $_org_unit_dimb) . ')';
$where = 'AND';
}
@@ -1033,9 +1033,9 @@
$where = 'AND';
}
- if($_department_dimb)
+ if($_org_unit_dimb)
{
- $filtermethod .= " $where
fm_s_agreement_budget.ecodimb IN (" . implode(',', $_department_dimb) . ')';
+ $filtermethod .= " $where
fm_s_agreement_budget.ecodimb IN (" . implode(',', $_org_unit_dimb) . ')';
$where = 'AND';
}
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -308,7 +308,7 @@
$querymethod = " $where (" . implode(' AND
',$_querymethod) . ')';
unset($_querymethod);
}
- $sql = "SELECT id, location_code, p_location_id, p_id,
department_id, xml_representation FROM fm_bim_item WHERE location_id =
{$location_id} $querymethod";
+ $sql = "SELECT id, location_code, p_location_id, p_id,
org_unit_id, xml_representation FROM fm_bim_item WHERE location_id =
{$location_id} $querymethod";
$sql_cnt = "SELECT count(id) as cnt FROM fm_bim_item
WHERE location_id = {$location_id} $querymethod";
@@ -390,9 +390,9 @@
'attrib_id' => false,
);
- $dataset[$j]['department_id'] = array
+ $dataset[$j]['org_unit_id'] = array
(
- 'value' =>
$this->db->f('department_id'),
+ 'value' =>
$this->db->f('org_unit_id'),
'datatype' => false,
'attrib_id' => false,
);
@@ -1608,7 +1608,7 @@
$values['status'] =
$this->db->f('status');
$values['user_id'] =
$this->db->f('user_id');
$values['entry_date'] =
$this->db->f('entry_date');
- $values['department_id'] =
$this->db->f('department_id');
+ $values['org_unit_id'] =
$this->db->f('org_unit_id');
if ( isset($values['attributes']) &&
is_array($values['attributes']) )
{
@@ -1659,7 +1659,7 @@
$values['location_code'] =
$this->db->f('location_code');
$values['user_id'] =
$this->db->f('user_id');
$values['entry_date'] =
$this->db->f('entry_date');
- $values['department_id'] =
$this->db->f('department_id');
+ $values['org_unit_id'] =
$this->db->f('org_unit_id');
$xmldata =
$this->db->f('xml_representation',true);
$xml = new DOMDocument('1.0', 'utf-8');
@@ -2062,7 +2062,7 @@
'location_code' =>
$data['location_code'],
'loc1' =>
$data['loc1'],
'address' =>
$data['address'],
- 'department_id' =>
$data['department_id']
+ 'org_unit_id' =>
$data['org_unit_id']
);
$value_set =
$this->db->validate_update($value_set);
Modified: branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.sogeneric.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -490,7 +490,7 @@
),
array
(
- 'name'
=> 'department',
+ 'name'
=> 'org_unit_id',
'descr'
=> lang('department'),
'type'
=> 'select',
'nullable'
=> false,
@@ -500,7 +500,7 @@
(
'valueset' => false,
'method' => 'property.bogeneric.get_list',
-
'method_input' => array('type' => 'department', 'selected' =>
'##department##')
+
'method_input' => array('type' => 'org_unit', 'selected' => '##org_unit_id##')
)
)
),
@@ -1631,11 +1631,11 @@
);
break;
- case 'department':
+ case 'org_unit':
$info = array
(
- 'table'
=> 'fm_department',
+ 'table'
=> 'fm_org_unit',
'id'
=> array('name' => 'id', 'type' => 'int'),
'fields'
=> array
(
@@ -1661,7 +1661,7 @@
(
'valueset' => false,
'method' => 'property.bogeneric.get_list',
-
'method_input' => array('type' => 'department', 'role' => 'parent', 'selected'
=> '##parent_id##')
+
'method_input' => array('type' => 'org_unit', 'role' => 'parent', 'selected'
=> '##parent_id##')
)
)
),
@@ -1670,7 +1670,7 @@
'name'
=> lang('department'),
'acl_app'
=> 'property',
'acl_location' =>
'.admin',
- 'menu_selection' =>
'admin::property::accounting::department',
+ 'menu_selection' =>
'admin::property::accounting::org_unit',
'default'
=> array
(
'created_by'
=> array('add' => '$this->account'),
@@ -3387,8 +3387,14 @@
}
+ /**
+ * Get tree from your node
+ * @param array $data - 'node_id' as parent and 'type'
+ * @return array tree
+ */
public function read_tree($data)
{
+ $parent_id = isset($data['node_id']) &&
$data['node_id'] ? (int) $data['node_id'] : 0;
$tree = array();
$this->get_location_info($data['type'],
$data['type_id']);
@@ -3399,7 +3405,14 @@
}
$this->table = $table;
- $filtermthod = 'WHERE (parent_id = 0 OR parent_id IS
NULL)';
+ if($parent_id)
+ {
+ $filtermthod = "WHERE parent_id = {$parent_id}";
+ }
+ else
+ {
+ $filtermthod = 'WHERE (parent_id = 0 OR
parent_id IS NULL)';
+ }
if (isset($data['filter']) && is_array($data['filter']))
{
@@ -3445,10 +3458,6 @@
$node['children'] = $children;
}
}
-if($tree)
-{
-// _debug_array($tree);die();
-}
return $tree;
}
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -1435,7 +1435,7 @@
if($old_budget != $new_budget)
{
$this->db->query("UPDATE fm_project SET
budget = {$new_budget} WHERE id = " . (int) $project['id'], __LINE__, __FILE__);
- $historylog->add('B', $project['id'],
$project['budget'], $old_budget);
+ $historylog->add('B', $project['id'],
$new_budget, $old_budget);
}
$this->db->query("SELECT id FROM fm_workorder
WHERE project_id=" . (int) $project['id'], __LINE__, __FILE__);
@@ -1520,7 +1520,7 @@
$historylog->add('B',
$project['id'], 0, $old_budget);
}
- $sql
= "SELECT sum(budget) AS sum_budget FROM fm_project_budget WHERE project_id =
{$new_project_id}";
+ $sql
= "SELECT sum(budget) AS sum_budget FROM fm_project_budget WHERE active = 1
AND project_id = {$new_project_id}";
$this->db->query($sql, __LINE__,
__FILE__);
$this->db->next_record();
$new_budget_new_project = (int)
$this->db->f('sum_budget');
@@ -1783,6 +1783,11 @@
throw new
Exception('property_soproject::update_buffer_budget() - wrong input');
}
+ if($from_project && $to_project)
+ {
+ throw new
Exception('property_soproject::update_buffer_budget() - wrong input');
+ }
+
$value_set = array
(
'buffer_project_id' => $project_id,
@@ -1807,7 +1812,8 @@
/**
* In case the transfer is betwee two buffer-projects
*/
- $this->db->query("SELECT project_type_id FROM
fm_project WHERE id = {$project_id}", __LINE__, __FILE__);
+ $check_for_buffer_target = $from_project +
$to_project;//only one of them has value...
+ $this->db->query("SELECT project_type_id FROM
fm_project WHERE id = {$check_for_buffer_target}", __LINE__, __FILE__);
$this->db->next_record();
$project_type_id = $this->db->f('project_type_id');
if($project_type_id == 3)//buffer
Modified: branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.uiadmin_entity.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -1170,8 +1170,8 @@
'lang_no_location_link_level'
=> lang('None'),
'tracking'
=> true,
'value_tracking'
=> $values['tracking'],
- 'department'
=> true,
- 'value_department'
=> $values['department'],
+ 'org_unit'
=> true,
+ 'value_org_unit'
=> $values['org_unit'],
'fileupload'
=> true,
'value_fileupload'
=> $values['fileupload'],
'value_jasperupload'
=> $values['jasperupload'],
Modified: branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -1090,7 +1090,7 @@
array_unshift ($values_combo_box[4],array
('id'=>'', 'name'=>lang('no category')));
- $values_combo_box[5] =
$this->bocommon->select_category_list(array('type'=>'department'));
+ $values_combo_box[5] =
$this->bocommon->select_category_list(array('type'=>'org_unit'));
array_unshift ($values_combo_box[5], array
('id'=>'','name'=>lang('department')));
$values_combo_box[6] =
$this->bocommon->select_category_list(array('type'=>'dimb'));
@@ -1181,13 +1181,13 @@
),
array
(
- 'id' =>
'sel_department',
- 'name'
=> 'department',
+ 'id' =>
'sel_org_unit_id',
+ 'name'
=> 'org_unit_id',
'value'
=> lang('department'),
'type'
=> 'select',
'style'
=> 'filter',
'values' => $values_combo_box[5],
-
'onchange'=> 'onChangeSelect("department");',
+
'onchange'=> 'onChangeSelect("org_unit_id");',
'tab_index' => 6
),
array
Modified: branches/Version-1_0-branch/property/inc/class.uientity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.uientity.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -1526,9 +1526,9 @@
if ((isset($values['save']) && $values['save']) ||
(isset($values['apply']) && $values['apply']))
{
- if($category['department'])
+ if($category['org_unit'])
{
- $values['extra']['department_id'] =
phpgw::get_var('department_id', 'int');
+ $values['extra']['org_unit_id'] =
phpgw::get_var('org_unit_id', 'int');
}
if($GLOBALS['phpgw']->session->is_repost())
{
@@ -2382,17 +2382,17 @@
$property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
}
- if($category['department'] && $mode == 'edit')
+ if($category['org_unit'] && $mode == 'edit')
{
$_autocomplete = <<<JS
YAHOO.util.Event.addListener(window,
"load", function()
{
- var oArgs =
{menuaction:'property.bogeneric.get_autocomplete', type:'department'};
+ var oArgs =
{menuaction:'property.bogeneric.get_autocomplete', type:'org_unit'};
var strURL =
phpGWLink('index.php', oArgs, true);
YAHOO.portico.autocompleteHelper(strURL,
- 'department_name', 'department_id',
'department_container');
+ 'org_unit_name', 'org_unit_id',
'org_unit_container');
});
JS;
@@ -2405,10 +2405,10 @@
'datatable'
=> $datavalues,
'myColumnDefs'
=> $myColumnDefs,
'enable_bulk'
=> $category['enable_bulk'],
- 'department'
=> $category['department'],
- 'value_department_id'
=> $values['department_id'],
- 'value_department_name'
=> $values['department_name'],
- 'value_department_name_path' =>
$values['department_name_path'],
+ 'org_unit'
=> $category['org_unit'],
+ 'value_org_unit_id'
=> $values['org_unit_id'],
+ 'value_org_unit_name'
=> $values['org_unit_name'],
+ 'value_org_unit_name_path' =>
$values['org_unit_name_path'],
'value_location_id'
=> $GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type],
$this->acl_location),
'link_pdf'
=> $GLOBALS['phpgw']->link('/index.php',$pdf_data),
'start_project'
=> $category['start_project'],
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -59,7 +59,7 @@
'fm_condition_survey' =>
array('name' => 'fm_condition_survey (' . lang('condition survey') . ')',
'permission' => PHPGW_ACL_READ | PHPGW_ACL_ADD | PHPGW_ACL_EDIT),
'fm_ecodimb'
=> array('name' => 'fm_ecodimb (' . lang('dimb') . ')', 'permission' =>
PHPGW_ACL_READ | PHPGW_ACL_ADD | PHPGW_ACL_EDIT),
'fm_budget'
=> array('name' => 'fm_budget (' . lang('budget') . ')', 'permission'
=> PHPGW_ACL_READ | PHPGW_ACL_ADD | PHPGW_ACL_EDIT),
- 'fm_department'
=> array('name' => 'fm_department (' . lang('department') . ')', 'permission'
=> PHPGW_ACL_READ | PHPGW_ACL_ADD | PHPGW_ACL_EDIT),
+ 'fm_org_unit'
=> array('name' => 'fm_org_unit (' . lang('department') . ')', 'permission' =>
PHPGW_ACL_READ | PHPGW_ACL_ADD | PHPGW_ACL_EDIT),
'fm_eco_periodization_outline' => array('name'
=> 'fm_eco_periodization_outline (' . lang('periodization outline') . ')',
'permission' => PHPGW_ACL_READ | PHPGW_ACL_ADD | PHPGW_ACL_EDIT),
'fm_eco_periodization' =>
array('name' => 'fm_eco_periodization (' . lang('periodization') . ')',
'permission' => PHPGW_ACL_READ | PHPGW_ACL_ADD | PHPGW_ACL_EDIT),
'fm_ecodimd'
=> array('name' => 'fm_ecodimd', 'permission' => PHPGW_ACL_READ | PHPGW_ACL_ADD
| PHPGW_ACL_EDIT),
Modified:
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
===================================================================
---
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
2014-04-10 08:48:17 UTC (rev 11899)
+++
branches/Version-1_0-branch/property/inc/cron/default/synkroniser_avdelinger_med_fellesdata.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -94,13 +94,13 @@
foreach ($parties as $party)
{
- $sql = "SELECT name, parent_id FROM
fm_department WHERE id = {$party}";
+ $sql = "SELECT name, parent_id FROM fm_org_unit
WHERE id = {$party}";
$this->db->query($sql,__LINE__,__FILE__);
if($this->db->next_record())
{
$name =
$this->db->f('name');
$parent_id =
$this->db->f('parent_id');
- $path =
$sogeneric->get_path(array('type' => 'department', 'id' => $parent_id));
+ $path =
$sogeneric->get_path(array('type' => 'org_unit', 'id' => $parent_id));
$parent_name = implode(' > ', $path);
$value_set = array
@@ -295,7 +295,7 @@
'modified_on' => time()
);
- $table = 'fm_department';
+ $table = 'fm_org_unit';
$db->query("SELECT count(*) as cnt FROM
{$table} WHERE id =" . (int)$unit['id'],__LINE__,__FILE__);
$db->next_record();
Modified: branches/Version-1_0-branch/property/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/setup.inc.php 2014-04-10
08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/setup/setup.inc.php 2014-04-10
08:52:46 UTC (rev 11900)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.680';
+ $setup_info['property']['version'] = '0.9.17.681';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -140,7 +140,7 @@
'fm_tts_tickets',
'fm_tts_history',
'fm_tts_views',
- 'fm_department',
+ 'fm_org_unit',
'fm_ecoart',
'fm_ecoavvik',
'fm_ecobilag_process_code',
Modified: branches/Version-1_0-branch/property/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_current.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/setup/tables_current.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -1082,11 +1082,11 @@
'fk' => array(),
'uc' => array()
),
- 'fm_department' => array(
+ 'fm_org_unit' => array(
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'parent_id' => array('type' =>
'int','precision' => '4','nullable' => true),
- 'name' => array('type' => 'varchar','precision'
=> '60','nullable' => False),
+ 'name' => array('type' => 'varchar','precision'
=> '200','nullable' => False),
'created_on' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'created_by' => array('type' => 'int',
'precision' => 4,'nullable' => False),
'modified_by' => array('type' =>
'int','precision' => 4,'nullable' => true),
@@ -1297,11 +1297,11 @@
'fd' => array(
'id' => array('type' => 'int','precision' =>
'4','nullable' => False),
'descr' => array('type' =>
'varchar','precision' => '50','nullable' => False),
- 'department' => array('type' =>
'int','precision' => '4','nullable' => False),
+ 'org_unit_id' => array('type' =>
'int','precision' => '4','nullable' => False),
),
'pk' => array('id'),
'ix' => array(),
- 'fk' => array('fm_department' => array('department' =>
'id')),
+ 'fk' => array('fm_org_unit' => array('org_unit_id' =>
'id')),
'uc' => array()
),
'fm_ecodimb_role' => array(
Modified: branches/Version-1_0-branch/property/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/tables_update.inc.php
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/setup/tables_update.inc.php
2014-04-10 08:52:46 UTC (rev 11900)
@@ -7939,7 +7939,7 @@
}
/**
- * Update property version from 0.9.17.670 to 0.9.17.671
+ * Update property version from 0.9.17.679 to 0.9.17.680
* Add department_id to entity tables
*/
$test[] = '0.9.17.679';
@@ -7983,3 +7983,52 @@
}
}
+ /**
+ * Update property version from 0.9.17.680 to 0.9.17.681
+ * Change name from department to org_unit
+ */
+ $test[] = '0.9.17.680';
+ function property_upgrade0_9_17_680()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+ $GLOBALS['phpgw_setup']->oProc->RenameTable('fm_department',
'fm_org_unit');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('fm_entity_category','department','org_unit');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('fm_ecodimb','department','org_unit_id');
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT * FROM
fm_entity_category");
+
+ $categories = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $categories[] = array
+ (
+ 'entity_id' =>
$GLOBALS['phpgw_setup']->oProc->f('entity_id'),
+ 'cat_id' =>
$GLOBALS['phpgw_setup']->oProc->f('id')
+ );
+ }
+
+ $tables = $GLOBALS['phpgw_setup']->oProc->m_odb->table_names();
+
+ foreach ($categories as $category)
+ {
+ $table =
"fm_entity_{$category['entity_id']}_{$category['cat_id']}";
+ if(in_array($table, $tables))
+ {
+ $metadata =
$GLOBALS['phpgw_setup']->oProc->m_odb->metadata($table);
+ if(isset($metadata['department_id']))
+ {
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn($table,'department_id','org_unit_id');
+ }
+ }
+ }
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.681';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
+
Modified: branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/templates/base/admin_entity.xsl
2014-04-10 08:52:46 UTC (rev 11900)
@@ -623,20 +623,20 @@
</xsl:when>
</xsl:choose>
<xsl:choose>
- <xsl:when test="department !=
''">
+ <xsl:when test="org_unit != ''">
<tr>
<td>
-
<xsl:variable name="lang_department">
+
<xsl:variable name="lang_org_unit">
<xsl:value-of select="php:function('lang', 'department')"/>
</xsl:variable>
-
<xsl:value-of select="$lang_department"/>
+
<xsl:value-of select="$lang_org_unit"/>
</td>
<td>
- <input
type="checkbox" name="values[department]" value="1">
+ <input
type="checkbox" name="values[org_unit]" value="1">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'department')"/>
</xsl:attribute>
-
<xsl:if test="value_department = '1'">
+
<xsl:if test="value_org_unit = '1'">
<xsl:attribute name="checked">
<xsl:text>checked</xsl:text>
</xsl:attribute>
Modified: branches/Version-1_0-branch/property/templates/base/entity.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/entity.xsl
2014-04-10 08:48:17 UTC (rev 11899)
+++ branches/Version-1_0-branch/property/templates/base/entity.xsl
2014-04-10 08:52:46 UTC (rev 11900)
@@ -586,16 +586,16 @@
<xsl:choose>
<xsl:when test="mode='edit'">
<xsl:choose>
-
<xsl:when test="department='1'">
+
<xsl:when test="org_unit='1'">
<tr>
<td>
<xsl:value-of
select="php:function('lang', 'department')"/>
</td>
<td>
<div class="autocomplete">
-
<input id="department_id"
name="department_id" type="hidden" value="{value_department_id}">
+
<input id="org_unit_id"
name="org_unit_id" type="hidden" value="{value_org_unit_id}">
</input>
-
<input id="department_name"
name="department_name" type="text" value="{value_department_name}"
title="{value_department_name_path}" size='60'>
+
<input id="org_unit_name"
name="org_unit_name" type="text" value="{value_org_unit_name}"
title="{value_org_unit_name_path}" size='60'>
<xsl:choose>
<xsl:when
test="disabled!=''">
<xsl:attribute name="disabled">
@@ -604,7 +604,7 @@
</xsl:when>
</xsl:choose>
</input>
-
<div id="department_container"/>
+
<div id="org_unit_container"/>
</div>
</td>
</tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11900] Merge 11896:11899 from trunk,
Sigurd Nes <=