[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11524] Merge 11516:11523 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11524] Merge 11516:11523 from trunk |
|
Date: |
Tue, 10 Dec 2013 20:24:16 +0000 |
Revision: 11524
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11524
Author: sigurdne
Date: 2013-12-10 20:24:15 +0000 (Tue, 10 Dec 2013)
Log Message:
-----------
Merge 11516:11523 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.soentity.inc.php
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/inc/class.sotts.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/ant-1.7.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/antlr-2.7.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barbecue-1.5-beta1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barcode4j-2.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-anim.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-awt-util.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-bridge.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-css.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-dom.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-ext.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-gvt.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-parser.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-script.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svg-dom.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svggen.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-util.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-xml.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bcel-5.2.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bsh-2.0b4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/castor-1.2.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-beanutils-1.8.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-collections-2.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-digester-2.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-javaflow-20060411.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-logging-1.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/dom4j-1.6.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-2.0.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hibernate3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hsqldb-1.8.0-10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/iText-2.1.7.js2.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-annotations-2.1.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-core-2.1.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-databind-2.1.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-5.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-applet-5.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-5.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-javaflow-5.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jaxen-1.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jcommon-1.0.15.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jdt-compiler-3.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jfreechart-1.0.12.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jpa.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/log4j-1.2.15.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/mondrian-3.1.1.12687.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/png-encoder-1.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-schemas-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/rhino-1.7R3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/saaj-api-1.3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/serializer.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/servlet-api-2.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-beans-2.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-core-2.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/velocity-1.7-dep.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xalan-2.7.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xbean.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xercesImpl-2.10.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis-ext.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis.jar
branches/Version-1_0-branch/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb
Removed Paths:
-------------
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/ant-1.7.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/antlr-2.7.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barbecue-1.5-beta1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barcode4j-2.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-anim.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-awt-util.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-bridge.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-css.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-dom.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-ext.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-gvt.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-parser.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-script.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svg-dom.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svggen.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-util.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-xml.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bcel-5.2.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bsh-2.0b4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/castor-1.2.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-beanutils-1.8.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-collections-2.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-digester-1.7.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-javaflow-20060411.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-logging-1.0.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/dom4j-1.6.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-1.7.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hibernate3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hsqldb-1.8.0-10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/iText-2.1.7.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-core-lgpl-1.7.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-mapper-lgpl-1.7.4.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-4.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-applet-4.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-4.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-javaflow-4.5.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jaxen-1.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jcommon-1.0.15.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jdt-compiler-3.1.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jfreechart-1.0.12.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jpa.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/log4j-1.2.15.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/mondrian-3.1.1.12687.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/png-encoder-1.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-schemas-3.7-20101029.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/rhino-1.7R1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/saaj-api-1.3.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/serializer.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/servlet.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-beans-2.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-core-2.5.5.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/velocity-1.7-dep.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xalan-2.7.1.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xbean.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xercesImpl-2.7.0.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis-ext.jar
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis.jar
branches/Version-1_0-branch/property/inc/import/default/cvs_import_bygningsdelstabell_bkb
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
branches/Version-1_0-branch/property/inc/import/default/cvs_oppdater_rental_party_bkb
branches/Version-1_0-branch/property/inc/import/default/efaktura_dnb_xml
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
+
/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
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/ant-1.7.1.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/ant-1.7.1.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/ant-1.7.1.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/antlr-2.7.5.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/antlr-2.7.5.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/antlr-2.7.5.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barbecue-1.5-beta1.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barbecue-1.5-beta1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/barbecue-1.5-beta1.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barcode4j-2.0.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/barcode4j-2.1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/barcode4j-2.1.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-anim.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-anim.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-anim.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-awt-util.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-awt-util.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-awt-util.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-bridge.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-bridge.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-bridge.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-css.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-css.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-css.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-dom.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-dom.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-dom.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-ext.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-ext.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-ext.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-gvt.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-gvt.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-gvt.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-parser.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-parser.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-parser.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-script.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-script.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-script.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svg-dom.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svg-dom.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-svg-dom.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svggen.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-svggen.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-svggen.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-util.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-util.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-util.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-xml.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/batik-xml.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/batik-xml.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bcel-5.2.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bcel-5.2.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/bcel-5.2.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bsh-2.0b4.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/bsh-2.0b4.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/bsh-2.0b4.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/castor-1.2.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/castor-1.2.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/castor-1.2.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-beanutils-1.8.0.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-beanutils-1.8.0.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/commons-beanutils-1.8.0.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-collections-2.1.1.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-collections-2.1.1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/commons-collections-2.1.1.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-digester-1.7.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-digester-2.1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/commons-digester-2.1.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-javaflow-20060411.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-javaflow-20060411.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/commons-javaflow-20060411.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-logging-1.0.4.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/commons-logging-1.1.1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/commons-logging-1.1.1.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/dom4j-1.6.1.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/dom4j-1.6.1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/dom4j-1.6.1.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-1.7.5.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/groovy-all-2.0.1.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/groovy-all-2.0.1.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hibernate3.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hibernate3.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/hibernate3.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hsqldb-1.8.0-10.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/hsqldb-1.8.0-10.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/hsqldb-1.8.0-10.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/iText-2.1.7.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/iText-2.1.7.js2.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/iText-2.1.7.js2.jar)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-annotations-2.1.4.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jackson-annotations-2.1.4.jar)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-core-2.1.4.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jackson-core-2.1.4.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-core-lgpl-1.7.4.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-databind-2.1.4.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jackson-databind-2.1.4.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jackson-mapper-lgpl-1.7.4.jar
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-4.5.0.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-5.5.0.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jasperreports-5.5.0.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-applet-4.5.0.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-applet-5.5.0.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jasperreports-applet-5.5.0.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-4.5.0.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-fonts-5.5.0.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jasperreports-fonts-5.5.0.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-javaflow-4.5.0.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jasperreports-javaflow-5.5.0.jar
(from rev 11523,
trunk/phpgwapi/inc/jasper/lib/jasperreports-javaflow-5.5.0.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jaxen-1.1.1.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jaxen-1.1.1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jaxen-1.1.1.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jcommon-1.0.15.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jcommon-1.0.15.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jcommon-1.0.15.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jdt-compiler-3.1.1.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jdt-compiler-3.1.1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jdt-compiler-3.1.1.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jfreechart-1.0.12.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jfreechart-1.0.12.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/jfreechart-1.0.12.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jpa.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jpa.jar (from rev
11523, trunk/phpgwapi/inc/jasper/lib/jpa.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/jxl-2.6.10.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/log4j-1.2.15.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/log4j-1.2.15.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/log4j-1.2.15.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/mondrian-3.1.1.12687.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/mondrian-3.1.1.12687.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/mondrian-3.1.1.12687.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/png-encoder-1.5.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/png-encoder-1.5.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/png-encoder-1.5.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.7-20101029.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-3.7-20101029.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/poi-3.7-20101029.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-3.7-20101029.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-3.7-20101029.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/poi-ooxml-3.7-20101029.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-schemas-3.7-20101029.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/poi-ooxml-schemas-3.7-20101029.jar
(from rev 11523,
trunk/phpgwapi/inc/jasper/lib/poi-ooxml-schemas-3.7-20101029.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/rhino-1.7R1.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/rhino-1.7R3.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/rhino-1.7R3.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/saaj-api-1.3.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/saaj-api-1.3.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/saaj-api-1.3.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/serializer.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/serializer.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/serializer.jar)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/servlet-api-2.4.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/servlet-api-2.4.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/servlet.jar
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-beans-2.5.5.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-beans-2.5.5.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/spring-beans-2.5.5.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-core-2.5.5.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/spring-core-2.5.5.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/spring-core-2.5.5.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/velocity-1.7-dep.jar
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/velocity-1.7-dep.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/velocity-1.7-dep.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xalan-2.7.1.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xalan-2.7.1.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/xalan-2.7.1.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xbean.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xbean.jar (from rev
11523, trunk/phpgwapi/inc/jasper/lib/xbean.jar)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xercesImpl-2.10.0.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/xercesImpl-2.10.0.jar)
===================================================================
(Binary files differ)
Deleted:
branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xercesImpl-2.7.0.jar
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis-ext.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis-ext.jar
(from rev 11523, trunk/phpgwapi/inc/jasper/lib/xml-apis-ext.jar)
===================================================================
(Binary files differ)
Deleted: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis.jar
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/inc/jasper/lib/xml-apis.jar (from
rev 11523, trunk/phpgwapi/inc/jasper/lib/xml-apis.jar)
===================================================================
(Binary files differ)
Modified: branches/Version-1_0-branch/property/inc/class.soentity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2013-12-10 19:09:12 UTC (rev 11523)
+++ branches/Version-1_0-branch/property/inc/class.soentity.inc.php
2013-12-10 20:24:15 UTC (rev 11524)
@@ -1064,10 +1064,10 @@
$user_column_filter = '';
if ($_user_columns)
{
- $user_column_filter = " OR
($attribute_filter AND id IN (" . implode(',',$_user_columns) .'))';
+ $user_column_filter = " OR
({$attribute_filter} AND id IN (" . implode(',',$_user_columns) .'))';
}
- $this->db->query("SELECT * FROM
$attribute_table WHERE list=1 AND $attribute_filter $user_column_filter ORDER
BY group_id, attrib_sort ASC");
+ $this->db->query("SELECT * FROM
{$attribute_table} WHERE list=1 AND {$attribute_filter} {$user_column_filter}
ORDER BY group_id, attrib_sort ASC");
$i = count($uicols['name']);
while ($this->db->next_record())
Modified: branches/Version-1_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2013-12-10 19:09:12 UTC (rev 11523)
+++ branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2013-12-10 20:24:15 UTC (rev 11524)
@@ -1180,6 +1180,9 @@
function read_single($location_code='',$values = array())
{
+ //cache result
+ static $location = array();
+
$location_array = explode('-',$location_code);
$type_id= count($location_array);
@@ -1188,6 +1191,11 @@
return;
}
+ if(isset($location[$location_code]))
+ {
+ return $location[$location_code];
+ }
+
$cols = "fm_location{$type_id}.category as cat_id";
$cols .= ",fm_location{$type_id}_category.descr as
category_name";
$cols_return[] = 'cat_id';
@@ -1255,6 +1263,8 @@
//_debug_array($cols_return);
//_debug_array($values);
+
+ $location[$location_code] = $values;
return $values;
}
Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2013-12-10 19:09:12 UTC (rev 11523)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php
2013-12-10 20:24:15 UTC (rev 11524)
@@ -42,6 +42,7 @@
public $sum_budget = 0;
public $sum_actual_cost = 0;
public $sum_difference = 0;
+ protected $global_lock = false;
public $soap_functions = array
(
@@ -904,8 +905,16 @@
$this->db->next_record();
$old_status = $this->db->f('status');
- $this->db->transaction_begin();
+ if ( $this->db->get_transaction() )
+ {
+ $this->global_lock = true;
+ }
+ else
+ {
+ $this->db->transaction_begin();
+ }
+
/*
** phpgw_fm_tts_append.append_type - Defs
** R - Reopen ticket
@@ -976,7 +985,10 @@
$receipt['message'][]= array('msg' =>
lang('Ticket %1 has been updated',$id));
}
- $this->db->transaction_commit();
+ if ( !$this->global_lock )
+ {
+ $this->db->transaction_commit();
+ }
return $receipt;
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-12-10 19:09:12 UTC (rev 11523)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-12-10 20:24:15 UTC (rev 11524)
@@ -182,6 +182,7 @@
switch ($file['type'])
{
case
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+ case
'application/vnd.oasis.opendocument.spreadsheet':
case 'application/vnd.ms-excel':
$this->csvdata =
$this->getexceldata($file['name']);
$valid_type = true;
@@ -191,6 +192,8 @@
$this->csvdata =
$this->getcsvdata($file['name']);
$valid_type = true;
break;
+ default:
+ throw new
Exception("Not a valid filetype: {$file['type']}");
}
if($valid_type)
Deleted:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_bygningsdelstabell_bkb
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_bygningsdelstabell_bkb
2013-12-10 19:09:12 UTC (rev 11523)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_bygningsdelstabell_bkb
2013-12-10 20:24:15 UTC (rev 11524)
@@ -1,100 +0,0 @@
-<?php
- class import_conversion
- {
- protected $db;
- public $messages = array();
- public $warnings = array();
- public $errors = array();
- public $debug = true;
- public function __construct()
- {
- if(!$GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, 'admin'))
- {
- die('go away');
- }
- set_time_limit(1000); //Set the time limit for this
request to 1000 seconds
- $this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
- $this->db = & $GLOBALS['phpgw']->db;
- $this->db->query("DELETE FROM fm_building_part");
- }
-
- public function add($data)
- {
- $debug = $this->debug;
- $success = false;
- if(!$data[2])
- {
- return true;
- }
-
- if($debug)
- {
- _debug_array($data);
- }
-
- $value_set = array();
-
- $value_set['id'] = $data[2];
- $value_set['descr'] =
$this->db->db_addslashes($data[3]);
- $value_set['filter_1'] = $data[4] ? 1 : '';
- $value_set['filter_2'] = $data[5] ? 1 : '';
- $value_set['filter_3'] = $data[6] ? 1 : '';
- $value_set['filter_4'] = $data[7] ? 1 : '';
-
-
- $cols = implode(',', array_keys($value_set));
- $values =
$this->db->validate_insert(array_values($value_set));
-
- $sql = "INSERT INTO fm_building_part ({$cols}) VALUES
({$values})";
-
- if($debug)
- {
- _debug_array($sql);
- }
- else
- {
- $success =
$this->db->query($sql,__LINE__,__FILE__);
- if($success)
- {
- $this->messages[] = "Successfully
imported building part: Title ({$data[2]}::{$data[3]})";
- $ok = true;
- }
- else
- {
- $this->errors[] = "Error importing
building part: Title ({$data[2]}::{$data[3]})";
- $ok = false;
- }
- }
-
- //update ticket
- $value_set = array();
- if($data[0])
- {
- $value_set['building_part'] =
$data[2];
- $value_set =
$this->db->validate_update($value_set);
- $sql = "UPDATE fm_tts_tickets SET {$value_set}
WHERE building_part = '{$data[0]}'";
-
-
- if($debug)
- {
- _debug_array($sql);
- }
- else
- {
- $success =
$this->db->query($sql,__LINE__,__FILE__);
- if($success)
- {
- $this->messages[] =
"Successfully updatet building part in ticket: Title ({$data[2]}::{$data[3]})";
- $ok = true;
- }
- else
- {
- $this->errors[] = "Error
updating building part in ticket: Title ({$data[2]}::{$data[3]})";
- $ok = false;
- }
- }
- }
-
- return $ok;
- }
- }
Copied:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb
(from rev 11523,
trunk/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb)
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb
(rev 0)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_oppdatering_av_bestilling_fra_agresso_bkb
2013-12-10 20:24:15 UTC (rev 11524)
@@ -0,0 +1,93 @@
+<?php
+ class import_conversion
+ {
+ protected $db;
+ public $messages = array();
+ public $warnings = array();
+ public $errors = array();
+ public $fields = array();
+ public $debug = true;
+
+ public function __construct()
+ {
+ set_time_limit(10000); //Set the time limit for this
request
+ $this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->db = & $GLOBALS['phpgw']->db;
+
phpgwapi_cache::session_clear('property','tts_listing_metadata');
+ }
+
+ public function add($data)
+ {
+ $fields = $this->fields;
+
+ $agresso_prosjekt = $this->decode($data[0]);
+ $prosjektstatus = $this->decode($data[1]);
+ $order_id = $this->decode($data[2]);
+ $actual_cost = (float)$this->decode($data[3]);
+
+ $this->db->query("SELECT id, actual_cost FROM
fm_tts_tickets WHERE order_id= '{$order_id}'",__LINE__,__FILE__);
+ $this->db->next_record();
+ $id = $this->db->f('id');
+ $old_actual_cost = $this->db->f('actual_cost');
+
+ if(!$id)
+ {
+ $this->errors[] = "Fant ikke bestillingen,
hopper over: {$order_id}";
+ return false;
+ }
+
+ $this->messages[] = "Oppdaterer melding #{$id}, gammelt
beløp: {$old_actual_cost}, nytt beløp: {$actual_cost}";
+
+ $value_set = array
+ (
+ 'agresso_prosjekt' => $agresso_prosjekt,
+ 'actual_cost' => $actual_cost
+ );
+
+ $value_set =
$this->db->validate_update($value_set);
+ $ok = $this->db->query("UPDATE fm_tts_tickets SET
$value_set WHERE id={$id}",__LINE__,__FILE__);
+
+
+// $prosjektstatus;
+
+/*
+ $ticket = array
+ (
+ 'status' => '';
+ );
+
+ $sotts = CreateObject('property.sotts');
+ $sotts->update_status($ticket,$id)
+*/
+ return $ok;
+ }
+
+
+ /**
+ * Convert from the locale encoding to UTF-8 encoding and
escape single quotes
+ *
+ * @param string $value The value to convert
+ * @return string
+ */
+ protected function decode($value)
+ {
+ $converted = trim($value);//
mb_convert_encoding($value, 'UTF-8');
+ if ($this->is_null($converted))
+ {
+ return null;
+ }
+ return stripslashes($converted);
+ }
+
+ /**
+ * Test a value for null according to several formats that can
exist in the export.
+ * Returns true if the value is null according to these rules,
false otherwise.
+ *
+ * @param string $value The value to test
+ * @return bool
+ */
+ protected function is_null($value)
+ {
+ return ((trim($value) == "") || ($data == "<NULL>") ||
($data == "''"));
+ }
+ }
Deleted:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
2013-12-10 19:09:12 UTC (rev 11523)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_vedlikeholdsplan_bkb
2013-12-10 20:24:15 UTC (rev 11524)
@@ -1,304 +0,0 @@
-<?php
- class import_conversion
- {
- protected $db;
- public $messages = array();
- public $warnings = array();
- public $errors = array();
- public $debug = true;
- public function __construct()
- {
- set_time_limit(10000); //Set the time limit for this
request oto 3000 seconds
- $this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
- $this->db = & $GLOBALS['phpgw']->db;
- $this->custom =
createObject('property.custom_fields');
- $this->attrib_data =
$this->custom->find('property', '.project.request', 0, '', 'ASC',
'attrib_sort', true, true);
- }
-
- public function add($data)
- {
-
- $debug = $this->debug;
- $error = false;
- $type = $data[0];
- $location_arr = explode('-',$data[1]);
-
- if(strpos($location_arr[0], 'A') !== false )
- {
- $location_code = $location_arr[0] . '-' .
sprintf("%04d",$data[2]);
- }
- else
- {
- $location_code = $location_arr[0] . '-' .
sprintf("%02d",$data[2]);
- }
-
- $location_data =
execMethod('property.solocation.read_single', $location_code );
-
- if($debug)
- {
- _debug_array($data);
- }
-
-
-//_debug_array($location_data);die();
- if(!$location_data)
- {
- $this->errors[] = "Error importing location:
{$location_code}";
- $error = true;
- return false;
- }
-
- $value_set = array();
-
- $value_set['loc1'] = $location_data['loc1'];
- $value_set['loc2'] = $location_data['loc2'];
-
-
- if($location_data['street_name'])
- {
- $address[]= $location_data['street_name'];
- $address[]= $location_data['street_number'];
- $address =
$this->db->db_addslashes(implode(" ", $address));
- }
-
- if(!$address)
- {
- $address =
$this->db->db_addslashes($location_data['loc1_name']);
- }
-
-
- $this->db->query("SELECT value FROM fm_idgenerator
WHERE name = 'request'");
- $this->db->next_record();
- $id = $this->db->f('value')+1;
-
- if($data[7])
- {
- $entry_date_info = explode('/',$data[7]);
- }
- else if($data[8])
- {
- $entry_date_info = explode('/',$data[8]);
- }
- //YYYY/MM/DD
-
- if(isset($entry_date_info[0]) &&
ctype_digit($entry_date_info[0]))
- {
- $entry_date =
strtotime("{$entry_date_info[0]}/06/24");
- }
- else
- {
- $this->messages[] = "Dagens dato er lagt inn
som registreringsdato for {$id} (mangler info)";
- $entry_date = time();
- }
-
-
-//_debug_array($entry_date_info);
-//_debug_array($entry_date);
-
- $status = 'registrert';
-
- if($data[3])//historikk
- {
- $status = 'avsluttet';
- }
-
- if($data[9])//Status - Utført
- {
- if($data[9] == 'Delvis')
- {
- $status = 'delvis';
- }
- else if($data[9] == 'Utgått')
- {
- $status = 'kansellert';
- }
- else
- {
- $status = 'avsluttet';
- $value_set['closed_date']
= strtotime("{$data[9]}/06/24");
- }
- }
-
-/*
- $value_set['in_progress_date'] = time();
- $value_set['delivered_date'] = time();
-*/
-
-
- switch ($data[4])
- {
- case 'D':
- $category = 13;
- break;
- case 'V':
- $category = 12;
- break;
- case 'U':
- $category = 14;
- break;
- case 'Kombinasjon':
- $category = 202;
- break;
- default:
- $category = 202;
- break;
-
- }
-
- $value_set['id']
= $id;
- $value_set['title']
= substr($this->db->db_addslashes("{$data[0]}::{$data[6]}::{$data[20]}"), 0 ,
100);
- $value_set['owner']
= $this->account;
- $value_set['category'] =
$category;
- $value_set['descr']
= $this->db->db_addslashes("{$data[6]}\n{$data[20]}");
- $value_set['location_code'] =
$location_code;
- $value_set['address'] =
$address;
- $value_set['entry_date'] =
$entry_date;
- $value_set['budget'] =
(int)str_replace(',', '', $data[21]);
- $value_set['status'] =
$status;
- // $value_set['coordinator'] =
$coordinator;
- $value_set['authorities_demands'] =
$authorities_demands;
- $value_set['building_part'] =
$data[5];
- $value_set['vurderingskriterie'] =
(int)$data[10];
-
- reset($this->attrib_data);
- foreach ( $this->attrib_data as $attrib )
- {
- if($attrib['datatype'] == 'LB' &&
$attrib['column_name'] == 'hjemmel')
- {
- foreach($attrib['choice'] as $choice)
- {
- if(strpos($choice['value'],
$data[11]) !== false)
- {
- $value_set['hjemmel']
= $choice['id'];
- break 2;
- }
- }
- }
- }
-
-/*
- reset($this->attrib_data);
- foreach ( $this->attrib_data as $attrib )
- {
- if($attrib['datatype'] == 'LB' &&
$attrib['column_name'] == 'forskriftshjemmel')
- {
- foreach($attrib['choice'] as $choice)
- {
- if(strpos($choice['value'],
$data[12]) !== false)
- {
-
$value_set['forskriftshjemmel'] = $choice['id'];
- break 2;
- }
- }
- }
- }
-*/
-
-
- $cols = implode(',', array_keys($value_set));
- $values =
$this->db->validate_insert(array_values($value_set));
-
- $sql = "INSERT INTO fm_request ({$cols}) VALUES
({$values})";
-
- if($debug)
- {
- _debug_array($sql);
- }
- else
- {
- $request_ok =
$this->db->query($sql,__LINE__,__FILE__);
- if($request_ok)
- {
- $this->db->query("UPDATE fm_idgenerator
set value = value + 1 where name = 'request'");
- }
- }
-
- $condition = array();
- $condition_type = (int) substr($data[14], 0, 1);
-//_debug_array($data);
- if($condition_type)
- {
- $condition[$condition_type] = array
- (
- 'degree' => $data[13] ?
(int)$data[13] : 0,
- 'probability' => $data[16] ?
(int)$data[16] : 0,
- 'consequence' => $data[15] ?
(int)$data[15] : 0,
- );
- }
-
-//_debug_array($condition);
- foreach ($condition as $condition_type => $value_type)
- {
- $sql = "INSERT INTO fm_request_condition
(request_id,condition_type,degree,probability,consequence,user_id,entry_date) "
- . "VALUES ("
- . $id. ","
- . $condition_type . ","
- . $value_type['degree']. ","
- . $value_type['probability']. ","
- . $value_type['consequence']. ","
- . $this->account . ","
- . time() . ")";
-
- if($debug)
- {
- _debug_array($sql);
- }
- else
- {
-
$this->db->query($sql,__LINE__,__FILE__);
- }
- }
-
- $consume_data = array();
-
- $j = 0;
- for ($i=22; $i<36; $i++)
- {
- $data[$i] = str_replace(',', '', $data[$i]);
-
- $year = 2012 - $j;
- $j++;
- if($data[$i] && ctype_digit($data[$i]))
- {
- $consume_data[] = array
- (
- 'value' => (int)$data[$i],
- 'date' =>
strtotime("{$year}/06/24")
- );
- }
- }
-
- foreach ($consume_data as $consume)
- {
- $sql = "INSERT INTO fm_request_consume
(request_id,amount,date,user_id,entry_date) "
- . "VALUES ("
- . $id . ","
- . (int)$consume['value'] . ","
- . (int)$consume['date'] . ","
- . $this->account . ","
- . time() . ")";
-
- if($debug)
- {
- _debug_array($sql);
- }
- else
- {
-
$this->db->query($sql,__LINE__,__FILE__);
- }
- }
-
-
- if(!$error)
- {
- $this->messages[] = "Successfully imported
location: Title ({$data[20]})";
- $ok = true;
- }
- else
- {
- $this->errors[] = "Error importing location:
Title ({$data[20]})";
- $ok = false;
- }
- return $ok;
- }
- }
Deleted:
branches/Version-1_0-branch/property/inc/import/default/cvs_oppdater_rental_party_bkb
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_oppdater_rental_party_bkb
2013-12-10 19:09:12 UTC (rev 11523)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_oppdater_rental_party_bkb
2013-12-10 20:24:15 UTC (rev 11524)
@@ -1,117 +0,0 @@
-<?php
- class import_conversion
- {
- protected $db;
- public $messages = array();
- public $warnings = array();
- public $errors = array();
- public $debug = true;
- public $fields = array();
- public $table;
- public $metadata = array();
-
- public function __construct()
- {
- set_time_limit(10000); //Set the time limit for this
request
- $this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
- $this->db = & $GLOBALS['phpgw']->db;
- }
-
- public function add($data)
- {
- $error = false;
- $table = $this->table;
- $fields = $this->fields;
-
- if(!$table)
- {
- throw new Exception("Tabell er ikke angitt");
- }
-
- if(!$fields)
- {
- throw new Exception("Felter er ikke definert");
- }
-
- $id = (int)$data[array_search('id', $fields)];
-
- if(!$id)
- {
- throw new Exception("Fant ikke verdi for feltet
'id'");
- }
-
- $value_set = array();
- foreach ($fields as $key => $field)
- {
- $value_set[$field] =
$this->validate_value($data[$key], $field);
- }
- unset($value_set['id']);
-
- $this->db->query("SELECT id FROM {$table} WHERE id =
{$id}",__LINE__,__FILE__);
- if($this->db->next_record())
- {
- $this->warnings[] = "ID finnes fra før: {$id},
oppdaterer";
- $value_set =
$this->db->validate_update($value_set);
- $sql = "UPDATE {$table} SET {$value_set} WHERE
id = {$id}";
- }
- else
- {
- $this->warnings[] = "ID fantes ikke fra før:
{$id}";
- }
-
- if($this->debug)
- {
- _debug_array($sql);
- }
- else
- {
- $request_ok =
$this->db->query($sql,__LINE__,__FILE__);
- }
-
- if(!$error)
- {
- $this->messages[] = "Successfully updated
party: Title ({$data[7]})";
- $ok = true;
- }
- else
- {
- $this->errors[] = "Error updating location:
Title ({$data[7]})";
- $ok = false;
- }
- return $ok;
- }
-
-
- /**
- * Test a value for null according to several formats that can
exist in the export.
- * Returns true if the value is null according to these rules,
false otherwise.
- *
- * @param string $value The value to test
- * @return bool
- */
- protected function is_null($value)
- {
- return ((trim($value) == "") || ($data == "<NULL>") ||
($data == "''"));
- }
-
- protected function validate_value($value,$field)
- {
- $datatype = $this->metadata[$field]->type;
- switch ($datatype)
- {
- case 'char':
- case 'varchar':
- case 'text':
- $ret = $this->db->db_addslashes($value);
- break;
- case 'bool':
- $ret = $value ? 'True' : 'False';
- break;
- default:
- $ret = $value;
- }
-
- return $ret;
- }
-
- }
Deleted:
branches/Version-1_0-branch/property/inc/import/default/efaktura_dnb_xml
===================================================================
--- branches/Version-1_0-branch/property/inc/import/default/efaktura_dnb_xml
2013-12-10 19:09:12 UTC (rev 11523)
+++ branches/Version-1_0-branch/property/inc/import/default/efaktura_dnb_xml
2013-12-10 20:24:15 UTC (rev 11524)
@@ -1,319 +0,0 @@
-<?php
- /**
- * phpGroupWare - property: a Facilities Management System.
- *
- * @author Sigurd Nes <address@hidden>
- * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
- * @package property
- * @subpackage import
- * @version $Id: Import_fra_BKK_csv,v 1.8 2007/03/18 16:33:16 sigurdne
Exp $
- */
-
- /**
- * Description
- * @package property
- */
-
- class import_conv
- {
- var $spbudact_code='12304121';
- var $mvakode=0;
- var $kildeid=1;
- var $splitt=0;
- var $soXport;
- var $invoice;
- var $meter_table;
- protected $bilagsnr = array();
-
- var $import = array
- (
- 'Bestilling' => 'pmwrkord_code',
- 'Fakt. Nr' => 'fakturanr',
- 'Måler nr' => 'maalernr',
- 'Konto' => 'spbudact_code',
- 'Objekt' => 'dima',
- 'Omr' => 'omraade',
- 'Adresse' => 'stedsnavn',
- 'MVA' => 'mvakode',
- 'Tjeneste' => 'kostra_id',
- 'Belop [kr]' => 'belop'
- );
-
-// var $header = array('Fakt. Nr','Måler
nr','Konto','Objekt','MVA','Belop [kr]','Omr','Adresse');
-
-
- function import_conv()
- {
- $this->soXport =
CreateObject('property.soXport');
- $this->invoice =
CreateObject('property.boinvoice');
- $this->config =
CreateObject('phpgwapi.config','property');
- $this->config->read_repository();
- $this->meter_table =
$this->config->config_data['meter_table'];
-
- $this->db = &
$GLOBALS['phpgw']->db;
- $this->join = &
$this->db->join;
- $this->left_join = &
$this->db->left_join;
- $this->like = &
$this->db->like;
- $this->datetimeformat = $this->db->datetime_format();
- $this->dateformat =
$this->db->date_format();
- }
-
- function import($invoice_common,$download)
- {
- $tsvfile = $invoice_common['tsvfile'];
- $conv_type = $invoice_common['conv_type'];
- $this->bilagsnr[] = $this->invoice->next_bilagsnr();
- $buffer = array();
- $xmlparse = CreateObject('property.XmlToArray');
- $xmlparse->setEncoding('UTF-8');
- $xmlparse->setDecodesUTF8Automaticly(false);
- $xmlparse->setIncludesEmptyValues(true);
- $var_result = $xmlparse->parseFile($tsvfile);
-
- $i = 0;
- if(isset($var_result['Invoice']))
- {
- foreach ($var_result['Invoice'] as $invoice)
- {
- foreach
($invoice['InvoiceHeader'][0]['Buyer'][0]['Ref'] as $_ref)
- {
- if ($_ref['Code'] ==
'CustomerNumber')
- {
- $kundenr =
$_ref['Text'];
- }
- }
-
- $supplier_orgnumber =
$invoice['InvoiceHeader'][0]['Supplier'][0]['OrgNumber'];
- $fakturanr =
$invoice['InvoiceHeader'][0]['InvoiceNumber'];
- $invoice_date =
date($this->dateformat,strtotime($invoice['InvoiceHeader'][0]['InvoiceDate']));
- $payment_date =
date($this->dateformat,strtotime($invoice['InvoiceHeader'][0]['Payment'][0]['DueDate']));
- $periode =
date('Ym',strtotime($invoice['InvoiceHeader'][0]['InvoiceDate']));
- $kidnr =
$invoice['InvoiceHeader'][0]['Payment'][0]['KidNumber'];
- $currency =
$invoice['InvoiceHeader'][0]['Payment'][0]['Currency'];
- $maalepunktid =
$invoice['InvoiceHeader'][0]['InvoiceReferences'][0]['BuyersOrderNumber'];
- $godkjentbelop =
$invoice['InvoiceSummary'][0]['InvoiceTotals'][0]['GrossAmount'];
- $kunde_navn =
$invoice['InvoiceHeader'][0]['Buyer'][0]['Name'];
-
- $stedsnavn =
$invoice['InvoiceHeader'][0]['Buyer'][0]['PostalAddress'][0]['Address1'] . "\n";
- $stedsnavn .=
$invoice['InvoiceHeader'][0]['Buyer'][0]['PostalAddress'][0]['Address2'] . "\n";
- $stedsnavn .=
$invoice['InvoiceHeader'][0]['Buyer'][0]['PostalAddress'][0]['PostalCode'] .
"\n";
- $stedsnavn .=
$invoice['InvoiceHeader'][0]['Buyer'][0]['PostalAddress'][0]['PostalDistrict']
. "\n";
-
- $buffer[$i]['bilagsnr'] =
max($this->bilagsnr);
-
- if($godkjentbelop < 0)
- {
- $buffer[$i]['artid'] = 2;
- }
- else
- {
- $buffer[$i]['artid'] =
$invoice_common['art'];
- }
-
- if( $invoice_common['art'] == 2 ) //
kreditnota
- {
- $godkjentbelop = -1 *
abs($godkjentbelop);
- }
-
- $merknad = <<<HTML
- <table cellspacing="10">
- <tr>
- <td>
- Målepunktid
- </td>
- <td>
- $maalepunktid
- </td>
- </tr>
- <tr>
- <td>
- Fakturanr
- </td>
- <td>
- $fakturanr
- </td>
- </tr>
- <tr>
- <td>
- Kundenr
- </td>
- <td>
- $kundenr
- </td>
- </tr>
- <tr>
- <td>
- Kundenavn
- </td>
- <td>
- $kunde_navn
- </td>
- </tr>
- <tr>
- <td>
- Adresse
- </td>
- <td>
- $stedsnavn
- </td>
- </tr>
- </table>
-HTML;
-
-
- $merknad .= <<<HTML
- <table cellspacing="10">
- <tr>
- <td>
- Beskrivelse
- </td>
- <td>
- Enhetspris
- </td>
- <td>
- Beløp
- </td>
- <td>
- Mengde
- </td>
- <td>
- Enhet
- </td>
- </tr>
-HTML;
-
- foreach($invoice['InvoiceDetails'] as
$invoicedetails)
- {
- foreach
($invoicedetails['BaseItemDetails'] as $baseitemdetails)
- {
- $line =
"<tr><td>{$baseitemdetails['Description']}</td>";
- $line .= '<td align =
"right">'. number_format(round($baseitemdetails['UnitPrice'],2),2). "</td>";
- $line .= '<td align =
"right">'."{$baseitemdetails['LineItemAmount']}</td>";
- $line .= '<td align =
"right">'."{$baseitemdetails['QuantityInvoiced']}</td>";
- $line .= '<td align =
"right">'."{$baseitemdetails['UnitOfMeasure']}</td></tr>";
- $merknad .= $line;
- }
- }
-
- $merknad .= <<<HTML
- </table>
-HTML;
- $buffer[$i]['merknad']
= $merknad;
-
- $maalerinfo =
$this->anleggsnr_to_objekt($maalepunktid,$this->meter_table);
- $dima = $maalerinfo['dima'];
- $loc1 = $maalerinfo['loc1'];
- $omraade =
$maalerinfo['district'];
-
- if($invoice_common['auto_tax'])
- {
-
$mvakode=$this->soXport->auto_tax($loc1);
-
- if($mvakode)
- {
- $buffer[$i]['mvakode']
= $mvakode;
- }
- else
- {
- $buffer[$i]['mvakode']
= $this->mvakode;
- }
- }
- else
- {
- $buffer[$i]['mvakode']
= $this->mvakode;
- }
-
- $buffer[$i]['stedsnavn']
= $stedsnavn;
- $buffer[$i]['currency']
= $currency;
- $buffer[$i]['fakturanr']
= $fakturanr;
- $buffer[$i]['dima']
= $dima;
- $buffer[$i]['loc1']
= $loc1;
- $buffer[$i]['omraade']
= $omraade;
- $buffer[$i]['splitt']
= $this->splitt;
- $buffer[$i]['kildeid']
= $this->kildeid;
- $buffer[$i]['spbudact_code']
= $this->spbudact_code;
- $buffer[$i]['kidnr']
= $kidnr;
- $buffer[$i]['typeid']
= $invoice_common['type'];
- $buffer[$i]['fakturadato']
= $invoice_date;
- $buffer[$i]['forfallsdato']
= $payment_date;
- $buffer[$i]['periode']
= $periode;
- $buffer[$i]['regtid']
= date($this->datetimeformat);
- $buffer[$i]['belop']
= $godkjentbelop;
- $buffer[$i]['godkjentbelop']
= $godkjentbelop;
- $buffer[$i]['spvend_code']
= $invoice_common['vendor_id'];
- $buffer[$i]['dimb']
= $invoice_common['dim_b'];
- $buffer[$i]['oppsynsmannid']
= $invoice_common['janitor'];
- $buffer[$i]['saksbehandlerid']
= $invoice_common['supervisor'];
- $buffer[$i]['budsjettansvarligid']
= $invoice_common['budget_responsible'];
-
- if($invoice_common['auto_tax'])
- {
- $buffer[$i]['mvakode']
= $this->soXport->tax_b_account_override($buffer[$i]['mvakode']
,$buffer[$i]['spbudact_code']);
- $buffer[$i]['mvakode']
= $this->soXport->tax_vendor_override($buffer[$i]['mvakode']
,$buffer[$i]['spvend_code']);
- $buffer[$i]['kostra_id']
= $this->soXport->get_kostra_id($buffer[$i]['loc1']);
- }
-
- $i++;
- $this->bilagsnr[] =
max($this->bilagsnr)+1;
- }
- }
-
- if(!$download)
- {
- $buffer = $this->import_end_file($buffer);
- }
-
-// $this->header = array('Fakt. Nr','Måler
nr','Konto','Objekt','MVA','Tjeneste','Belop [kr]','Omr','Adresse');
- return $buffer;
- }
-
-
- function anleggsnr_to_objekt($anleggsnr,$meter_table)
- {
- $sql = "SELECT
{$meter_table}.maaler_nr,{$meter_table}.loc1,{$meter_table}.loc2,{$meter_table}.loc3,fm_part_of_town.district_id
"
- . " FROM {$meter_table} {$this->join} fm_location1 ON
{$meter_table}.loc1 = fm_location1.loc1 $this->join "
- . " fm_part_of_town ON fm_location1.part_of_town_id =
fm_part_of_town.part_of_town_id WHERE {$meter_table}.maalepunkt_id
{$this->like} '%{$anleggsnr}'";
-// _debug_array($sql);
- $this->db->query($sql);
-
- $this->db->next_record();
- $loc1 = $this->db->f('loc1');
- $loc2 = $this->db->f('loc2');
-
- $maalerinfo['loc1']=$loc1;
- $maalerinfo['dima']=$loc1.$loc2;
- $maalerinfo['maalernr']=$this->db->f('maaler_nr');
- $maalerinfo['district']=$this->db->f('district_id');
- return $maalerinfo;
- }
-
- function import_end_file($buffer)
- {
-
-//_debug_array($buffer);die();
- $num = $this->soXport->add($buffer);
- array_pop($this->bilagsnr);
- $bilagsnr = max($this->bilagsnr);
- $this->db->query("UPDATE fm_idgenerator SET VALUE
={$bilagsnr} WHERE name = 'Bilagsnummer'");
- $receipt['message'][]= array('msg' =>
lang('Successfully imported %1 records into your invoice register.',$num).'
'.lang('ID').': '. implode(',', $this->bilagsnr));
- return $receipt;
- }
- }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11524] Merge 11516:11523 from trunk,
Sigurd Nes <=