[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12087] Merge 12074:12086 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [12087] Merge 12074:12086 from trunk |
|
Date: |
Tue, 09 Sep 2014 14:02:28 +0000 |
Revision: 12087
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12087
Author: sigurdne
Date: 2014-09-09 14:02:27 +0000 (Tue, 09 Sep 2014)
Log Message:
-----------
Merge 12074:12086 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.yuical.inc.php
branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
branches/Version-1_0-branch/rental/inc/class.socontract.inc.php
branches/Version-1_0-branch/rental/inc/class.soprice_item.inc.php
branches/Version-1_0-branch/rental/inc/class.uiadjustment.inc.php
branches/Version-1_0-branch/rental/inc/class.uibilling.inc.php
branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
branches/Version-1_0-branch/rental/inc/model/class.agresso_lg04.inc.php
branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
branches/Version-1_0-branch/rental/setup/phpgw_no.lang
branches/Version-1_0-branch/rental/setup/setup.inc.php
branches/Version-1_0-branch/rental/setup/tables_current.inc.php
branches/Version-1_0-branch/rental/setup/tables_update.inc.php
branches/Version-1_0-branch/rental/templates/base/adjustment.php
branches/Version-1_0-branch/rental/templates/base/adjustment_list_partial.php
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.php
branches/Version-1_0-branch/rental/templates/base/contract.php
branches/Version-1_0-branch/rental/templates/base/contract_list_partial.php
branches/Version-1_0-branch/rental/templates/base/contracts_for_regulation_list.php
Added Paths:
-----------
branches/Version-1_0-branch/rental/js/rental/contract.edit.js
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:ignore
- header.inc.php
.svnignore
.cache
.settings
.project
.*.swp
nbproject
.buildpath
+ header.inc.php
.svnignore
.cache
.settings
.project
.*.swp
nbproject
.buildpath
.~lock.hms_1_1.xml#
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619,11621-11622,11624-11630,11632,11634-11635,11637,11639-11640,11642,11644-11655,11657-11659,11661-11675,11677-11679,11681-11684,11686,11688,11690-11691,11693-11706,11708-11709,11711-11714,11716-11718,11720-11728,11730,11732,11734-11739,11741-11757,11759-11760,11762-11766,11768,11770-11771,11773,11775,11777,11779-11780,11782,11784,11786,11788,11790,11792-11793,11795,11797,11799,11801,11803-11804,11806-11807,11809,11811-11814,11816-11820,11822,11824-11826,11828,11830,11832,11834,11836-11837,11839,11841,11843,11845-11847,11849-11852,11854-11856,11858-11860,11862-11863,11865,11867,11869-11870,11872,11874,11876-11879,11881-11891,11893,11895,11897-11899,11901,11903,11905-11906,11908-11917,11919,11921,11923-11925,11927-11931,11933-11954,11956-11962,11964-11969,11971-11973,11975-11976,11978,11980,11982,11984,11986-11991,11993,11995,11997-12000,12002,12004-12006,12008,12010-12011,12013,12015,12017-12018,12020-12021,12023,12025,12027-12028,12030,12032-12036,12038,12040-12042,12044-12045,12047,12049-12052,12054,12056-12063,12065-12073,12075-12086
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.jqcal.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -41,7 +41,7 @@
}
- function add_listener($name, $type = 'date')
+ function add_listener($name, $type = 'date', $value = '')
{
switch($type)
{
@@ -55,6 +55,7 @@
}
$this->_input_modern($name, $_type);
+ return "<input id='{$name}' type='text'
value='{$value}' size='10' name='{$name}'/>";
}
/**
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.yuical.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.yuical.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.yuical.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -180,7 +180,7 @@
$lang_close = lang('close');
$lang_clear = lang('clear');
$html .= <<<HTML
- <input type="text" name="{$name}" id="{$name}"
size="10" value="$value" readonly="true" />
+ <input type="text" name="{$name}" id="{$name}"
size="10" value="$date" readonly="true" />
<!-- <img src="$img" alt="$alt" id="{$name}_img"
title="$name"> -->
<input type="hidden" name="{$name}_hidden"
id="{$name}_hidden" value="{$date2}"/>
<div id="calendar{$name}">
Modified: branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -65,7 +65,7 @@
}
else
{
- $cols = 'id, price_item_id, responsibility_id,
new_price, percent, adjustment_interval, adjustment_date, adjustment_type,
is_executed, year';
+ $cols = 'id, price_item_id, responsibility_id,
new_price, percent, adjustment_interval, adjustment_date, adjustment_type,
extra_adjustment, is_executed, year';
$order = $sort_field ? "ORDER BY
{$this->marshal($sort_field, 'field')} $dir ": ' ORDER BY adjustment_date DESC';
}
@@ -85,6 +85,7 @@
$adjustment->set_adjustment_date($this->unmarshal($this->db->f('adjustment_date',
true), 'int'));
$adjustment->set_adjustment_type($this->unmarshal($this->db->f('adjustment_type'),
'string'));
$adjustment->set_is_manual($this->unmarshal($this->db->f('is_manual'),'bool'));
+
$adjustment->set_extra_adjustment($this->unmarshal($this->db->f('extra_adjustment'),'bool'));
$adjustment->set_is_executed($this->unmarshal($this->db->f('is_executed'),'bool'));
$adjustment->set_year($this->unmarshal($this->db->f('year'), 'int'));
}
@@ -116,6 +117,7 @@
'adjustment_type = \'' .
$adjustment->get_adjustment_type() . '\'',
'is_manual = ' . ($adjustment->is_manual() ? "true" :
"false"),
'is_executed = ' . ($adjustment->is_executed() ? "true"
: "false"),
+ 'extra_adjustment = ' .
($adjustment->is_extra_adjustment() ? "true" : "false"),
'year = ' . $adjustment->get_year()
);
@@ -133,7 +135,7 @@
public function add(&$adjustment)
{
// Build a db-friendly array of the adjustment object
- $cols = array('price_item_id', 'responsibility_id',
'new_price', 'percent', 'adjustment_interval', 'adjustment_date',
'adjustment_type', 'is_manual', 'is_executed', 'year');
+ $cols = array('price_item_id', 'responsibility_id',
'new_price', 'percent', 'adjustment_interval', 'adjustment_date',
'adjustment_type', 'is_manual', 'is_executed', 'extra_adjustment', 'year');
$values = array(
$adjustment->get_price_item_id(),
$adjustment->get_responsibility_id(),
@@ -144,6 +146,7 @@
'\''.$adjustment->get_adjustment_type().'\'',
($adjustment->is_manual() ? "true" : "false"),
($adjustment->is_executed() ? "true" : "false"),
+ ($adjustment->is_extra_adjustment() ? "true" :
"false"),
$adjustment->get_year()
);
@@ -222,6 +225,7 @@
$adjustment->set_adjustment_type($this->unmarshal($this->db->f('adjustment_type'),
'string'));
$adjustment->set_is_manual($this->unmarshal($this->db->f('is_manual'),'bool'));
$adjustment->set_is_executed($this->unmarshal($this->db->f('is_executed'),'bool'));
+
$adjustment->set_extra_adjustment($this->unmarshal($this->db->f('extra_adjustment'),'bool'));
$adjustment->set_year($this->unmarshal($this->db->f('year'), 'int'));
$adjustments[] = $adjustment;
}
@@ -264,11 +268,18 @@
$adjustable_contracts = "SELECT id, adjustment_share,
date_start, adjustment_year FROM rental_contract ";
$adjustable_contracts .= "WHERE location_id =
'{$adjustment->get_responsibility_id()}' AND adjustable ";
$adjustable_contracts .= "AND adjustment_interval =
{$adjustment->get_interval()} ";
- $adjustable_contracts .= "AND (((adjustment_year +
{$adjustment->get_interval()}) <= {$adjustment->get_year()})";
- $adjustable_contracts .= " OR ";
- $adjustable_contracts .= "(adjustment_year IS NULL OR
adjustment_year = 0)";
- $adjustable_contracts .= ")";
+ $adjustable_contracts .= "AND (((adjustment_year +
{$adjustment->get_interval()}) <= {$adjustment->get_year()})";
+ $adjustable_contracts .= " OR ";
+ $adjustable_contracts .= "(";
+ if($adjustment->is_extra_adjustment())
+ {
+ $adjustable_contracts .= "adjustment_year =
{$adjustment->get_year()}";
+ $adjustable_contracts .= " OR ";
+ }
+ $adjustable_contracts .= "(adjustment_year IS NULL OR
adjustment_year = 0)";
+ $adjustable_contracts .= "))";
//var_dump($adjustable_contracts);
+ //die();
$result = $this->db->query($adjustable_contracts);
while($this->db->next_record())
{
Modified: branches/Version-1_0-branch/rental/inc/class.socontract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.socontract.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/class.socontract.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -207,6 +207,9 @@
if($filters['adjustment_is_executed']){
$filter_clauses[] = "contract.adjustment_year =
{$adjustment_year}";
}
+ else if($filters['extra_adjustment']){
+ $filter_clauses[] = "(contract.adjustment_year +
{$adjustment_interval} <= {$adjustment_year} OR contract.adjustment_year =
{$adjustment_year} )";
+ }
else{
$filter_clauses[] = "contract.adjustment_year +
{$adjustment_interval} <= {$adjustment_year}";
}
@@ -236,17 +239,32 @@
* - ended:
* the end date is smaller than the target date
*/
- if(isset($filters['contract_status']) &&
$filters['contract_status'] != 'all'){
+ if($filters['start_date_report'])
+ {
+ $filters['contract_status'] = 'all';
+ $filter_clauses[] = "contract.date_end >
{$filters['start_date_report']}";
+ $filter_clauses[] = "contract.date_start <
{$filters['start_date_report']}";
- if(isset($filters['status_date_hidden']) &&
$filters['status_date_hidden'] != "")
+ }
+ if($filters['end_date_report'])
+ {
+ $filters['contract_status'] = 'all';
+ $filter_clauses[] = "contract.date_end <
{$filters['end_date_report']}";
+
+ }
+//_debug_array($filtes);die();
+ if(isset($filters['contract_status']) &&
$filters['contract_status'] != 'all')
+ {
+ if(isset($filters['status_date']) &&
$filters['status_date'])
{
- $ts_query =
strtotime($filters['status_date_hidden']); // target timestamp specified by user
+ $ts_query = $filters['status_date']; // target
timestamp specified by user
}
else
{
$ts_query = strtotime(date('Y-m-d')); //
timestamp for query (today)
}
- switch($filters['contract_status']){
+ switch($filters['contract_status'])
+ {
case 'under_planning':
$filter_clauses[] =
"contract.date_start > {$ts_query} OR contract.date_start IS NULL";
break;
@@ -324,7 +342,7 @@
{
// columns to retrieve
$columns[] = 'contract.id AS contract_id';
- $columns[] = 'contract.date_start, contract.date_end,
contract.old_contract_id, contract.executive_officer, contract.last_updated,
contract.location_id, contract.billing_start, contract.service_id,
contract.responsibility_id, contract.reference, contract.invoice_header,
contract.project_id, billing.deleted, contract.account_in,
contract.account_out, contract.term_id, contract.security_type,
contract.security_amount, contract.comment, contract.due_date,
contract.contract_type_id,contract.rented_area,contract.adjustable,contract.adjustment_interval,contract.adjustment_share,contract.adjustment_year,contract.publish_comment';
+ $columns[] = 'contract.date_start, contract.date_end,
contract.old_contract_id, contract.executive_officer, contract.last_updated,
contract.location_id, contract.billing_start, contract.billing_end,
contract.service_id, contract.responsibility_id, contract.reference,
contract.invoice_header, contract.project_id, billing.deleted,
contract.account_in, contract.account_out, contract.term_id,
contract.security_type, contract.security_amount, contract.comment,
contract.due_date,
contract.contract_type_id,contract.rented_area,contract.adjustable,contract.adjustment_interval,contract.adjustment_share,contract.adjustment_year,contract.publish_comment';
$columns[] = 'party.id AS party_id';
$columns[] = 'party.first_name, party.last_name,
party.company_name, party.department, party.org_enhet_id';
$columns[] = 'c_t.is_payer';
@@ -385,6 +403,7 @@
)
);
$contract->set_billing_start_date($this->unmarshal($this->db->f('billing_start'),'int'));
+
$contract->set_billing_end_date($this->unmarshal($this->db->f('billing_end'),'int'));
$contract->set_old_contract_id($this->unmarshal($this->db->f('old_contract_id'),'string'));
$contract->set_contract_type_title($this->unmarshal($this->db->f('title'),'string'));
$contract->set_comment($this->unmarshal($this->db->f('comment'),'string'));
@@ -580,6 +599,7 @@
$values[] = "invoice_header = ".
$this->marshal($contract->get_invoice_header(),'string');
$values[] = "term_id = " .
$this->marshal($contract->get_term_id(), 'int');
$values[] = "billing_start = " .
$this->marshal($contract->get_billing_start_date(), 'int');
+ $values[] = "billing_end = " .
$this->marshal($contract->get_billing_end_date(), 'int');
$values[] = "reference = ".
$this->marshal($contract->get_reference(),'string');
// FORM COLUMN 2
@@ -726,6 +746,11 @@
$values[] =
$this->marshal($contract->get_billing_start_date(), 'int');
}
+ if ($contract->get_billing_end_date()) {
+ $cols[] = 'billing_end';
+ $values[] =
$this->marshal($contract->get_billing_end_date(), 'int');
+ }
+
if ($contract->get_contract_date()) {
$cols[] = 'date_start';
$cols[] = 'date_end';
Modified: branches/Version-1_0-branch/rental/inc/class.soprice_item.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.soprice_item.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/class.soprice_item.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -361,7 +361,21 @@
(str_replace(',','.',$price_item->get_price())
* $factor),
str_replace(',','.',$total_price)
);
- $q = "INSERT INTO rental_contract_price_item
(price_item_id, contract_id, title, area, agresso_id, is_area, price,
total_price) VALUES (" . join(',', $values) . ")";
+ $start_date_field = '';
+ $end_date_field = '';
+
+ if( $start_date = $contract->get_billing_start_date())
+ {
+ $values[] = $start_date;
+ $start_date_field = ", date_start";
+ }
+ if( $end_date = $contract->get_billing_end_date())
+ {
+ $values[] = $end_date;
+ $end_date_field = ", date_end";
+ }
+
+ $q = "INSERT INTO rental_contract_price_item
(price_item_id, contract_id, title, area, agresso_id, is_area, price,
total_price {$start_date_field} {$end_date_field}) VALUES (" . join(',',
$values) . ")";
//var_dump($q);
$result = $this->db->query($q);
if($result)
Modified: branches/Version-1_0-branch/rental/inc/class.uiadjustment.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uiadjustment.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/class.uiadjustment.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -168,6 +168,7 @@
$adjustment->set_percent(phpgw::get_var('percent'));
$adjustment->set_interval(phpgw::get_var('interval'));
$adjustment->set_adjustment_type(phpgw::get_var('adjustment_type'));
+
$adjustment->set_extra_adjustment(phpgw::get_var('extra_adjustment') == 'on' ?
true : false);
$so_adjustment =
rental_soadjustment::get_instance();
if($so_adjustment->store($adjustment))
Modified: branches/Version-1_0-branch/rental/inc/class.uibilling.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uibilling.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/class.uibilling.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -519,7 +519,13 @@
{
case 'all_billings':
$filters = array();
- if($sort_field == 'responsibility_title'){
+ if(!$sort_field)
+ {
+ $sort_field = 'timestamp_stop';
+ $sort_ascending = false;
+ }
+ else if($sort_field == 'responsibility_title')
+ {
$sort_field = 'location_id';
}
$result_objects =
rental_sobilling::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
Modified: branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -16,6 +16,8 @@
include_class('rental', 'contract_price_item', 'inc/model/');
include_class('rental', 'notification', 'inc/model/');
+ phpgw::import_class('phpgwapi.datetime');
+
class rental_uicontract extends rental_uicommon
{
private $pdf_templates = array();
@@ -85,7 +87,7 @@
case 'contracts_for_adjustment':
$adjustment_id =
(int)phpgw::get_var('id');
$adjustment =
rental_soadjustment::get_instance()->get_single($adjustment_id);
- $filters = array('contract_type' =>
$adjustment->get_responsibility_id(), 'adjustment_interval' =>
$adjustment->get_interval(), 'adjustment_year' => $adjustment->get_year(),
'adjustment_is_executed' => $adjustment->is_executed());
+ $filters = array('contract_type' =>
$adjustment->get_responsibility_id(), 'adjustment_interval' =>
$adjustment->get_interval(), 'adjustment_year' => $adjustment->get_year(),
'adjustment_is_executed' => $adjustment->is_executed(), 'extra_adjustment' =>
$adjustment->is_extra_adjustment());
break;
case 'contracts_part':
// Contracts for this party
$filters = array('party_id' =>
phpgw::get_var('party_id'),'contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'), 'status_date_hidden' =>
phpgw::get_var('status_date_hidden'));
@@ -151,7 +153,8 @@
break;
case 'contracts_for_composite': // ... all
contracts this composite is involved in, filters (status and date)
- $filters = array('composite_id' =>
phpgw::get_var('composite_id'),'contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'), 'status_date_hidden' =>
phpgw::get_var('date_status_hidden'));
+ $filters = array('composite_id' =>
phpgw::get_var('composite_id'),'contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'));
+ $filters['status_date']
= phpgwapi_datetime::date_to_timestamp(phpgw::get_var('date_status'));
break;
case 'get_contract_warnings': //get the
contract warnings
$contract =
rental_socontract::get_instance()->get_single(phpgw::get_var('contract_id'));
@@ -167,7 +170,11 @@
phpgwapi_cache::session_set('rental',
'contract_status', phpgw::get_var('contract_status'));
phpgwapi_cache::session_set('rental',
'contract_status_date', phpgw::get_var('date_status'));
phpgwapi_cache::session_set('rental',
'contract_type', phpgw::get_var('contract_type'));
- $filters = array('contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'), 'status_date_hidden' =>
phpgw::get_var('date_status_hidden'));
+ $filters = array('contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'));
+ $filters['status_date']
= phpgwapi_datetime::date_to_timestamp(phpgw::get_var('date_status'));
+ $filters['start_date_report'] =
phpgwapi_datetime::date_to_timestamp(phpgw::get_var('start_date_report'));
+ $filters['end_date_report']
= phpgwapi_datetime::date_to_timestamp(phpgw::get_var('end_date_report'));
+// _debug_array($filters);
}
if($type != 'get_contract_warnings'){
$result_objects =
rental_socontract::get_instance()->get($start_index, $num_of_objects,
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
@@ -336,6 +343,9 @@
*/
public function index()
{
+// phpgw::import_class('phpgwapi.jquery');
+// phpgwapi_jquery::load_widget('core');
+// self::add_javascript('rental', 'rental',
'contract.index.js');
$search_for = phpgw::get_var('search_for');
if($search_for)
@@ -450,6 +460,10 @@
$contract_id = (int)phpgw::get_var('id');
$location_id = (int)phpgw::get_var('location_id');
$update_price_items = false;
+
+ phpgw::import_class('phpgwapi.jquery');
+ phpgwapi_jquery::load_widget('core');
+ self::add_javascript('rental', 'rental',
'contract.edit.js');
$message = null;
$error = null;
@@ -497,8 +511,8 @@
}
}
- $date_start =
strtotime(phpgw::get_var('date_start_hidden'));
- $date_end =
strtotime(phpgw::get_var('date_end_hidden'));
+ $date_start =
phpgwapi_datetime::date_to_timestamp(phpgw::get_var('date_start'));
+ $date_end =
phpgwapi_datetime::date_to_timestamp(phpgw::get_var('date_end'));
if(isset($contract)){
$contract->set_contract_date(new
rental_contract_date($date_start, $date_end));
@@ -512,7 +526,8 @@
$contract->set_location_id($location_id); // only present when new contract
}
$contract->set_term_id(phpgw::get_var('billing_term'));
-
$contract->set_billing_start_date(strtotime(phpgw::get_var('billing_start_date_hidden')));
+
$contract->set_billing_start_date(phpgwapi_datetime::date_to_timestamp(phpgw::get_var('billing_start_date')));
+
$contract->set_billing_end_date(phpgwapi_datetime::date_to_timestamp(phpgw::get_var('billing_end_date')));
$contract->set_service_id(phpgw::get_var('service_id'));
$contract->set_responsibility_id(phpgw::get_var('responsibility_id'));
$contract->set_reference(phpgw::get_var('reference'));
@@ -539,7 +554,7 @@
//}
$contract->set_project_id(phpgw::get_var('project_id'));
-
$contract->set_due_date(strtotime(phpgw::get_var('due_date_hidden')));
+
$contract->set_due_date(phpgwapi_datetime::date_to_timestamp(phpgw::get_var('due_date')));
$contract->set_contract_type_id(phpgw::get_var('contract_type'));
$old_rented_area =
$contract->get_rented_area();
$new_rented_area =
phpgw::get_var('rented_area');
@@ -618,10 +633,10 @@
{
$account_id =
phpgw::get_var('notification_target');
$location_id =
phpgw::get_var('notification_location');
- $date =
phpgw::get_var('date_notification_hidden');
+ $date =
phpgw::get_var('date_notification');
if($date)
{
- $date = strtotime($date);
+ $date =
phpgwapi_datetime::date_to_timestamp($date);
}
$notification = new
rental_notification(-1, $account_id, $location_id, $contract_id, $date,
phpgw::get_var('notification_message'),
phpgw::get_var('notification_recurrence'));
if
(rental_sonotification::get_instance()->store($notification))
@@ -714,6 +729,7 @@
$contract->set_contract_date(null);
$contract->set_due_date(null);
$contract->set_billing_start_date(null);
+ $contract->set_billing_end_date(null);
if($so_contract->store($contract))
{
// copy the contract
Modified: branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -120,7 +120,22 @@
{
$this->is_executed = (boolean)$is_executed;
}
+
+ public function get_extra_adjustment()
+ {
+ return $this->extra_adjustment;
+ }
+ public function is_extra_adjustment()
+ {
+ return $this->extra_adjustment;
+ }
+
+ public function set_extra_adjustment($extra_adjustment)
+ {
+ $this->extra_adjustment = (boolean)$extra_adjustment;
+ }
+
public function get_interval()
{
return $this->interval;
@@ -153,6 +168,7 @@
'interval' => $this->get_interval(),
'adjustment_type' =>
lang(($this->get_adjustment_type())?$this->get_adjustment_type():'none'),
'adjustment_date' => date($date_format,
$this->get_adjustment_date()),
+ 'extra_adjustment' =>
lang(($this->is_extra_adjustment())?'yes':'no'),
'is_executed' =>
lang(($this->is_executed())?'yes':'no'),
'year' => $this->get_year()
);
Modified:
branches/Version-1_0-branch/rental/inc/model/class.agresso_lg04.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/model/class.agresso_lg04.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/model/class.agresso_lg04.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -206,8 +206,9 @@
/**Sigurd:Start contract type**/
$contract =
rental_socontract::get_instance()->get_single($invoice->get_contract_id());
- $current_contract_type_id =
$contract->get_contract_type_id();
- $contract_type_label =
lang(rental_socontract::get_instance()->get_contract_type_label($current_contract_type_id));
+ $current_contract_type_id =
$contract->get_contract_type_id();
+ $contract_type_label =
lang(rental_socontract::get_instance()->get_contract_type_label($current_contract_type_id));
+ $contract_id =
$contract->get_old_contract_id();
/**End contract type**/
$price_item_data = array();
@@ -248,8 +249,8 @@
$price_item_counter,
$invoice->get_account_in(),//ny
$invoice->get_responsibility_id(),//ny
- $contract_type_label //ny
-
+ $contract_type_label, //ny
+ $contract_id //ny
);
$price_item_counter++;
}
@@ -443,7 +444,7 @@
* Builds one single order of the excel file.
*
*/
- protected function get_order_excel_bk($header, $party_id,
$party_name, $order_id, $bill_year, $bill_month, $account, $product_item,
$responsibility, $service, $building, $project, $text, $client_ref, $counter)
+ protected function get_order_excel_bk($header, $party_id,
$party_name, $order_id, $bill_year, $bill_month, $account, $product_item,
$responsibility, $service, $building, $project, $text, $client_ref,
$counter,$account_in,$responsibility_id, $contract_type_label, $contract_id)
{
//$order_id = $order_id + 39500000;
@@ -452,6 +453,7 @@
$item_counter = $counter;
$order = array(
+ 'contract_id' => $contract_id,
'account' =>
$account,
'client_ref' => $client_ref,
'header' =>
utf8_decode($header),
@@ -482,14 +484,15 @@
return str_replace(array("\n", "\r"), '', $order);
}
- protected function get_order_excel_nlsh($header, $party_id,
$party_name, $order_id, $bill_year, $bill_month, $account_out, $product_item,
$responsibility, $service, $building, $project, $text, $client_ref,
$counter,$account_in,$responsibility_id, $contract_type_label)
+ protected function get_order_excel_nlsh($header, $party_id,
$party_name, $order_id, $bill_year, $bill_month, $account_out, $product_item,
$responsibility, $service, $building, $project, $text, $client_ref,
$counter,$account_in,$responsibility_id, $contract_type_label, $contract_id)
{
//_debug_array(func_get_args());
$item_counter = $counter;
$order = array
(
- 'Kontraktstype' =>
$contract_type_label,//FIXME
+ 'contract_id' => $contract_id,
+ 'Kontraktstype' =>
$contract_type_label,//FIXME
'Art/konto inntektsside' => $account_in,
'Art/konto utgiftsside' => $account_out,//FIXME
'client_ref' => $client_ref,
@@ -545,4 +548,4 @@
return sprintf("%017.17s", $belop);
}
- }
\ No newline at end of file
+ }
Modified: branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/inc/model/class.contract.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -42,6 +42,7 @@
protected $parties;
protected $contract_date;
protected $billing_start_date;
+ protected $billing_end_date;
protected $location_id;
protected $term_id;
protected $term_id_title;
@@ -210,6 +211,31 @@
return '';
}
+ public function set_billing_end_date($date)
+ {
+ $this->billing_end_date = $date;
+ }
+
+ /**
+ * Returns date of when the last invoice should be produced for
the
+ * contract.
+ * @return string with UNIX time.
+ */
+ public function get_billing_end_date()
+ {
+ if(isset($this->billing_end_date))
+ {
+ return $this->billing_end_date;
+ }
+
+ if(isset($this->contract_date))
+ {
+ return $this->contract_date->get_end_date();
+ }
+
+ return '';
+ }
+
public function set_location_id($location_id)
{
$this->field_of_responsibility_id = (int) $location_id;
@@ -1210,6 +1236,16 @@
}
}
+ // If set, the billing date must be between the
contract's start date and end date
+ $billing_end = $this->get_billing_end_date();
+ if(isset($billing_end) &&
is_numeric($billing_end) && $billing_end > 0)
+ {
+ if($billing_end < $start_date ||
(isset($end_date) && $billing_end > $end_date))
+ {
+
$this->set_consistency_warning(lang('warning_billing_end_date_between'));
+ }
+ }
+
// If set, the due date must be between the
contract's start date and end date
$due_date = $this->get_due_date();
if(isset($due_date) && is_numeric($due_date) &&
$due_date > 0)
Copied: branches/Version-1_0-branch/rental/js/rental/contract.edit.js (from rev
12086, trunk/rental/js/rental/contract.edit.js)
===================================================================
--- branches/Version-1_0-branch/rental/js/rental/contract.edit.js
(rev 0)
+++ branches/Version-1_0-branch/rental/js/rental/contract.edit.js
2014-09-09 14:02:27 UTC (rev 12087)
@@ -0,0 +1,24 @@
+$(document).ready(function(){
+ $("#date_start").change(function(){
+
+ var date_start = $("#date_start").val();
+ var billing_start = $("#billing_start_date").val();
+ if(!billing_start)
+ {
+ $("#billing_start_date").val(date_start);
+ }
+
+ });
+
+ $("#date_end").change(function(){
+
+ var date_end = $("#date_end").val();
+ var billing_end_date = $("#billing_end_date").val();
+ if(!billing_end_date)
+ {
+ $("#billing_end_date").val(date_end);
+ }
+
+ });
+
+});
\ No newline at end of file
Modified: branches/Version-1_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2014-09-09
11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2014-09-09
14:02:27 UTC (rev 12087)
@@ -1,599 +1,603 @@
-1-6 characters rental no 1-6 tegn
-6 characters rental no 6 tegn
-account_in rental no Art/konto inntektsside
-account_in_not_numeric rental no Art/konto inntektsside må være et tall
-account_number rental no Kontonummer
-account_out rental no Art/konto utgiftsside
-account_out_not_numeric rental no Art/konto utgiftsside må være
et tall
-active_party rental no Kontraktspart er aktiv
-active_plural rental no Aktive
-active_single rental no Aktiv
-active rental no Aktiv
-add_area rental no Legg til areal
-added_areas rental no Inkludert areal
-add rental no Legg til
-address rental no Adresse
-adjust_price rental no Juster pris
-adjustment rental no Regulering
-adjustable rental no Regulerbar
-adjustment_interval rental no Reguleringsintervall
-adjustment_is_executed rental no Reguleringen er utført
-adjustment_is_not_executed rental no Reguleringen er ikke utført
-adjustment_list rental no Reguleringer
-adjustment_list_out_of_date rental no Det er kjørt en nyere
regulering for samme utvalg av kontrakter
-adjustment_share rental no Reguleringsandel
-adjustment_type rental no Reguleringstype
-adjustment_year rental no Sist regulert
-adjustment_date rental no Reguleringsdato
-adjustment_type_KPI rental no KPI
-adjustment_type_deflator rental no Kommunal deflator
-advance rental no Forskudd
-agresso_id rental no Agresso-ID
-agresso_gl07 rental no Agresso GL07 - hovedbokstall
-agresso_lg04 rental no Agresso LG04 - salgsordrer
-add_location rental no Legg enhet til leieobjektet
-address1 rental no Adresse 1
-address2 rental no Adresse 2
-all rental no Alle
-all_locations rental no Enheter fra eiendomsregisteret
-and rental no og
-annually rental no Årlig
-area_gros rental no Bruttoareal
-area_net rental no Nettoareal
-area_not_found rental no Kunne ikke finne detaljer om arealet
-area rental no Areal
-area decimal places rental no Antall desimaler for arealer
-area suffix rental no Areal suffix
-area_max rental no Max areal
-audience rental no Målgrupper
-availability rental no Status
-availability_date rental no Dato
-available_areas rental no Tilgjenglig areal
-available_at rental no Ledig på dato
-available_composites rental no Ledige leieobjekt
-available_composites rental no Tilgjengelige leieobjekter
-available_from rental no Tilgjengelig fra
-available_parties rental no Tilgjengelige kontraktsparter
-available_price_items rental no Tilgjengelige priselementer
-available? rental no Kan leies ut?
-available rental no Tilgjengelig
-available_for_pick rental no tilgjengelig
-back rental no Tilbake
-bank_guarantee rental no Bankgaranti
-Billing date rental no Fakturadato
-billing time limit rental no Faktura - tidsgrense
-billing_external rental no Ekstern
-billing_internal rental no Intern
-billing_start rental no Fakturastart
-billing_term rental no Termin
-billing_terms rental no Terminer
-billing_unit rental no Ansvar-/tjenestested
-billing_removed_KF_contract rental no Fjernet KF-kontrakt med id
-billing_removed_contract_part_1 rental no Fjernet kontrakt
-billing_removed_contract_part_2 rental no med total pris lik 0
kroner
-billing_removed_external_contract rental no Kontrakt med
ansvarsområde eksternleie må ha kontrakttype
-bill rental no Faktura
-bill2 rental no Fakturér
-btn_add rental no Deleger tilgang til bruker
-btn_search rental no Finn bruker
-building rental no Bygg
-calculations_internal_investment rental no Beregningsgrunnlag
internleie/investeringer
-calculate_price_apiece rental no Pris regnes per stk.
-calculate_price_per_area rental no Pris regnes ut fra areal
-calendar_months rental no
["Januar","Februar","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"]
-calendar_weekdays rental no ["Sø","Ma","Ti","On","To","Fr","Lø"]
-cancel rental no Avbryt
-category config move in rental no Kategori for
innflyttingsmeldinger
-category config move out rental no Kategori for
utflyttingsmeldinger
-close rental no Lukk
-clear rental no Nullstill
-closing_due_date rental no Nær opsjonsfrist
-CSV rental no CSV
-comment rental no Kommentar
-comments rental no Kommentarer
-Commit rental no Avslutt
-Commited rental no Avsluttet
-company rental no Foretak
-company_name rental no Foretak
-composite_name rental no Navn på leieobjekt
-composite_address rental no Adresse på leieobjekt
-composite rental no Leieobjekt
-composite_back rental no Leieobjektsliste
-composite_has_contract rental no Leieobjekt med aktive kontrakter
-composite_has_no_contract rental no Leieobjekt uten aktive
kontrakter
-composite standard rental no Leieobjekt standard
-factor common no Faktor
-contract rental no Kontrakt
-contract_back rental no Kontraktsliste
-contract_id rental no Kontraktsnummer
-contract_not_adjustable rental no Kontrakten er ikke regulerbar
-contract_number rental no Kontraktnummer
-contract_warning rental no Advarsler
-contracts_containing_this_composite rental no Kontrakter knyttet til
dette leieobjektet
-contracts rental no Kontrakter
-contracts_under_dismissal rental no Kontrakter under avslutning
-contract_under_dismissal rental no Under avslutning
-contract_notifications rental no Kontraktens varsler
-contract_notification_status rental no Status
-contracts_for_regulation rental no Regulering med tilhørende
kontrakter
-contract_regulation_back rental no Regulering
-contracts_removed rental no Kontrakter som er fjernet fra
fakturakjøringen
-contracts_with_one_time rental no Kontrakter med engangsbeløp
-contracts_in_cycle rental no Kontrakter som følger vanlig
fakturasyklus
-contracts_out_of_cycle rental no Kontrakter som avviker fra vanlig
faktureringssyklus
-contracts_not_billed_before rental no Kontrakter som ikke er
fakturert tidligere
-contract_status rental no Status
-contract_type_eksternleie rental no Eksternleie
-contract_type_eksternleie_feste rental no Feste (1520)
-contract_type_eksternleie_leilighet rental no Leilighet (1530)
-contract_type_eksternleie_annen rental no Annen (1510)
-contract_type_innleie rental no Innleie
-contract_type_internleie rental no Internleie
-contract_type_internleie_egne rental no Egne
-contract_type_internleie_innleie rental no Innleie
-contract_type_internleie_investeringskontrakt rental no
Investeringskontrakt
-contract_type_internleie_KF rental no KF
-contract_type_internleie_andre rental no Andre
-contract_type_investeringskontrakt rental no Investeringskontrakt
-contract_type rental no Kontrakttype
-contract_type_id rental no Kontrakttype
-contract_types rental no Kontrakttyper
-contract_type_internleie_1 rental no Utført internleieregulering av
kontrakter som reguleres hvert år
-contract_type_internleie_2 rental no Utført internleieregulering av
kontrakter som reguleres hvert annet år
-contract_type_internleie_10 rental no Utført internleieregulering av
kontrakter som reguleres hvert tiende år
-contract_type_innleie_1 rental no Utført innleieregulering av
kontrakter som reguleres hvert år
-contract_type_innleie_2 rental no Utført innleieregulering av
kontrakter som reguleres hvert annet år
-contract_type_innleie_10 rental no Utført innleieregulering av
kontrakter som reguleres hvert tiende år
-contract_type_eksternleie_1 rental no Utført eksternleieregulering av
kontrakter som reguleres hvert år
-contract_type_eksternleie_2 rental no Utført eksternleieregulering av
kontrakter som reguleres hvert annet år
-contract_type_eksternleie_10 rental no Utført eksternleieregulering av
kontrakter som reguleres hvert tiende år
-contracts_closing_due_date rental no Kontrakter nær opsjonsfrist
-contract_future_info rental no Fremtidig kontraktsinformasjon
-Could not find specified billing job. rental no Kunne ikke finne
spesifisert fakturering.
-count decimal places rental no Antall desimaler for opptelling
-count rental no Antall
-count_suffix rental no stk
-count_suffix rental no stk
-create_billing rental no Opprett fakturakjøring
-create_shortcut rental no Ny snarvei
-create_contract_contract_type_eksternleie rental no Opprett
eksternleiekontrakt
-create_contract_contract_type_innleie rental no Opprett innleiekontrakt
-create_contract_contract_type_internleie rental no Opprett
internleiekontrakt
-create_user_based_on_email_link rental no Opprett bruker basert
på e-post
-create user based on email group rental no Velg gruppe nye brukere
blir innmeldt i
-cs15_export rental no Kundefil
-currency decimal places rental no Antall desimaler for valuta
-currency prefix rental no Valuta prefix
-currency suffix rental no Valuta suffix
-currency_thousands_separator rental no .
-custom_address rental no overstyrt
-dashboard_title rental no Forside - Min arbeidsoversikt
-DATATABLE_MSG_EMPTY rental no Ingen data
-DATATABLE_MSG_ERROR rental no Datafeil
-DATATABLE_MSG_LOADING rental no Laster data
-date_end rental no Gjelder til
-date rental no Dato
-date_start rental no Gjelder fra
-decimal separator rental no Skilletegn for desimaler
-delegates rental no Delegering
-delegate_removed rental no Delegaten ble fjernet.
-delegation_error rental no Feil under delegering
-delegation_successful rental no Velykket delegering
-delete rental no Slett
-department rental no Avdeling
-deposit rental no Depositum
-description rental no Beskrivelse
-details rental no Detaljer
-document_type rental no Dokumenttype
-documents rental no Dokumenter
-Download Agresso import file rental no Last ned Agresso-importfil
(CS15)
-Download as %1 rental no Last tabellen i %1-format
-Download export rental no Last ned eksporten
-do_not_exist rental no Eksisterer ikke
-due_date rental no Opsjonsfrist
-economy rental no Økonomi
-edit_contract rental no Redigér kontrakt
-edit rental no Redigér
-elements_pr_page rental no elementer per side
-elements rental no Elementer
-email rental no E-post
-email_create_user_based_on_email_title rental no Tilgang til Portico
Estate
-email_create_user_based_on_email_message rental no Hei %1
%2:<br/>Det er opprettet en tilgang for deg i Portico
Estate<br/><br/>Brukernavnet er e-posten din<br/>Passordet er
%3<br/><br/>Systemet kan nås på adressen %4
-ended rental no Avsluttet
-entity config move out rental no Entitet for utflytting
-entity config move in rental no Entitet for innflytting
-error_create_user_based_on_email rental no En feil oppstod under
opprettelse av bruker
-error_create_user_based_on_email_account_exist rental no En konto med
denne e-posten som brukernavn eksisterer allerede
-error_create_user_based_on_email_not_valid_address rental no Kan
ikke opprette kontoen pga av e-postadressen ikke er gyldig
-error_no_contract_or_party rental no Ingen kontrakt eller
kontraktspart å utføre handlingen på
-events rental no Hendelser
-every_second_week rental no Hver 14. dag
-Excel rental no Excel
-execute_adjustments rental no Utfør reguleringer
-executive_officer rental no Saksbehandler
-executive_officer_for rental no Saksbehandler for
-export rental no Eksport
-export_contracts rental no Eksporter kontrakter
-export_contract_price_items rental no Eksporter priselementer på
kontrakter
-Export failed. rental no Eksporten feilet.
-Export format rental no Format
-Export generated. rental no Eksporten ble generert.
-export_to rental no Eksporter
-external rental no Eksterne kontraktsparter
-facilit_import rental no Import fra Facilit
-failed_removing_delegate rental no Det oppstod en feil under
sletting av delegaten.
-fax rental no Faks
-fellesdata_not_in_use rental no Fellesdata er ikke i bruk
-field_of_responsibility rental no Ansvarsområde
-filters rental no Filtre
-Finish rental no Avslutt
-fire_drawings rental no Branntegninger
-firstname rental no Fornavn
-first rental no Første
-first_half rental no 1. halvår
-first_quarter rental no 1. kvartal
-fixed rental no Tidsbestemt
-floor rental no Etasje
-fourth_quarter rental no 4. kvartal
-f_new_contract rental no Opprett kontrakt
-f_new_party rental no Ny kontraktspart
-f_new_price_item rental no Nytt priselement
-f_new_rc rental no Nytt leieobjekt
-from rental no Fra
-from email setting rental no E-post adresse systemmeldinger (Fra)
-frontpage_was_reset rental no Oppsettet på forsiden ble nullstilt
-frontpage_reset_setup rental no Nullstill oppsett
-frontend_access rental no Gå til frontend som valgt leietaker
-f_select_columns rental no Velg kolonner
-furnish_type rental no Møbleringsstatus
-furnish_type_not_specified rental no Ikke spesifisert
-furnish_type_furnished rental no Møblert
-furnish_type_partly_furnished rental no Delvis møblert
-furnish_type_not_furnished rental no Ikke møblert
-gab rental no GAB
-gab_id rental no GAB
-Generate export rental no Generér eksport
-Generate cs15 rental no Generér kundefil
-get_sync_data rental no Hent data fra Fellesdata
-half-year rental no Halvårig
-hidden rental no Skjult
-hidden_for_pick rental no skjult
-has_custom_address rental no Er adressen overstyrt?
-house_number rental no Husnummer
-http address for external users rental no HTTP adresse for
eksterne brukere
-id rental no ID
-Identifier rental no Identifikator
-import_log_messages rental no Import log
-import_reset rental no Nullstill importstatus
-in_operation rental no I drift
-inactive_party rental no Kontraktspart er inaktiv
-inactive rental no Inaktiv
-included_units rental no Leieobjektets enheter
-internal rental no Interne kontraktsparter
-interval rental no Intervall
-Invalid location code for the building. rental no Ugyldig
objektnummer for bygg.
-invoice rental no Faktura
-invoice_run rental no Fakturakjøring
-invoice_menu rental no Faktura
-invoice_header rental no Fakturaoverskrift
-is_active rental no Aktiv
-is_area rental no Areal
-is_payer rental no Fakturamottaker
-is_inactive rental no Inaktiv
-is_adjustable rental no Indeksreguleres
-is_executed rental no Utført
-is_one_time rental no Engangsbeløp
-is_standard rental no Standard priselement
-job_title rental no Stillingstittel
-land_title rental no Gnr/Bnr
-lacking_username rental no Brukernavn må fylles ut
-last_edited_by_current_user rental no Din siste endring
-lastname rental no Etternavn
-last rental no Siste
-last_updated rental no Sist oppdatert
-level rental no Nivå
-link rental no Lenke
-location_code rental no Enhetsnummer
-location_id rental no Intern organisasjonstilknytning
-log_in_to_add_notfications rental no Det er bare mulig å legge til
varlser i redigeringsmodus.
-make_pdf rental no Lag PDF for utskrift
-manual_adjust_price_item rental no Manuell regulering av
priselement
-manual_adjust_price_item_select rental no Velg priselement
-manual_adjustment rental no Manuell regulering
-marked_as rental no og er merket
-max_area rental no Areal
-message rental no Melding
-messages_agresso_id_length rental no Agresso-ID må inneholde 9 tall
eller bokstaver
-messages_fontpage_not_saved rental no Oppsettet ble ikke lagret
-messages_fontpage_saved rental no Oppsettet ble lagret
-messages_form_error rental no Skjemaet inneholder en feil.
-messages_general rental no Feil i feltet
-messages_isint rental no Feltet må inneholde et heltall
-messages_isnumeric rental no Feltet må inneholde et tall
-messages_new_composite rental no Leieobjektet er opprettet
-messages_new_contract rental no Ny kontrakt lagt til
-messages_new_contract_copied rental no Ny kontrakt lagt til basert på
kontrakt
-messages_new_contract_from_composite rental no Ny kontrakt lagt til
basert på leieobjekt
-messages_new_party rental no Kontraktspart er opprettet
-messages_not_valid_date rental no Må være en gyldig dato
-messages_number_out_of_range rental no Tallet er over eller under
tillatte verdier
-messages_required_field rental no Dette feltet er påkrevd
-messages_right_click_to_add rental no Høyreklikk for å legge til
-messages_saved_form rental no Informasjonen ble lagret.
-messages_string_too_long rental no Teksten er for lang
-Missing account in. rental no Inngående konto mangler.
-Missing account out. rental no Utgående konto mangler.
-Missing billing information. rental no Ufullstendig
konteringsinformasjon for kontrakt med id %1. Dette må rettes for å kunne
fakturere kontrakten.
-Missing contract party. rental no Kontraktspart mangler.
-Missing payer id. rental no Mangler fakturamottaker.
-Missing project id. rental no Prosjektnummer mangler.
-Missing responsibility id. rental no Ansvar mangler.
-Missing service id. rental no Tjeneste mangler.
-Missing system setting for project id. rental no Systeminnstilling for
prosjektnummer mangler.
-Missing system setting for responsibility id for the current user. rental
no Systeminnstilling for ansvar mangler.
-missing_agresso_id rental no Agresso Id må fylles ut
-mobile_phone rental no Mobiltelefon
-month 1 rental no januar
-month 2 rental no februar
-month 3 rental no mars
-month 4 rental no april
-month 5 rental no mai
-month 6 rental no juni
-month 7 rental no juli
-month 8 rental no august
-month 9 rental no september
-month 10 rental no oktober
-month 11 rental no november
-month 12 rental no desember
-month 0 capitalized rental no Ikke tilgjengelig
-month 1 capitalized rental no Januar
-month 2 capitalized rental no Februar
-month 3 capitalized rental no Mars
-month 4 capitalized rental no April
-month 5 capitalized rental no Mai
-month 6 capitalized rental no Juni
-month 7 capitalized rental no Juli
-month 8 capitalized rental no August
-month 9 capitalized rental no September
-month 10 capitalized rental no Oktober
-month 11 capitalized rental no November
-month 12 capitalized rental no Desember
-monthly rental no Månedlig
-month rental no Måned
-name rental no Navn
-never rental no Aldri
-new_notification rental no Nytt varsel
-new_billing rental no Ny fakturering
-new_adjustment rental no Ny regulering
-new_price rental no Ny pris
-next rental no Neste
-no rental no Nei
-none rental no Ingen
-nobody rental no Ingen
-No billing jobs found rental no Ingen faktureringer funnet
-no_contracts_found rental no Ingen kontrakter passet til
søkekriteriene
-No contracts were selected. rental no Du må velge minst én kontrakt
for å faktuere.
-no_hits rental no Ingen treff
-No invoices were found rental no Ingen fakturaer funnet
-no_name_composite rental no Leieobjekt uten navn (løpenummer: %1)
-no_party_location rental no Ingen intern organisasjonstilhørighet
-no_value rental no Ingen
-not_available rental no Ikke tilgjengelig
-notification_status rental no Varsel
-notifications rental no Varsler
-notification_optgroup_groups rental no Grupper
-notification_optgroup_users rental no Brukere
-not_started rental no Ikke startet
-not_available_nor_hidden rental no tilgjengelig eller skjult
-object_number rental no Objektnummer
-objno_name_address rental no Objektnummer/navn/adresse
-occupied rental no Opptatt
-of_total rental no av totalt
-ok rental no Ok
-old_contract_id rental no Gammelt kontraktsnummer
-ODS rental no ODS
-One or more price items are missing Agresso ids. rental no Ett
eller flere priselementer mangler Agresso-id.
-One or more price items have an invalid Agresso id. Id must consist of one
capital letter and three digits. rental no Ett eller flere
priselementer har en ugyldig Agresso-id. Iden må bestå av én stor bokstav og
tre tall.
-only_one_time rental no Status
-only_one_time_yes rental no Avviker fra vanlig faktureringssyklus,
kun engangsbeløp
-only_one_time_no rental no Følger vanlig fakturasyklus
-open_and_exported_exist rental no En fakturakjøring som ikke er
avsluttet med eksportert til Agresso-format eksisterer for dette
ansvarsområdet. Denne må enten slettes eller avsluttes før denne
fakturakjøringen kan eksportes.
-organisation_number rental no Organisasjonsnummer
-organisation_or_ssn_number rental no Org./fødselsnr
-orphan_units rental no Ubrukte arealer
-or rental no eller
-org_enhet_id rental no Organisasjonsenhet
-org_unit_name rental no Navn på tilsvarende enhet i Fellesdata
-org_unit_exist rental no Eksisterer
-other_guarantee rental no Annen garanti
-others rental no Annet
-out_of_operation rental no Ikke i drift
-overridden_address rental no Overstyrt adresse
-override rental no Fakturer fra
-panels rental no Vinduer
-part_of_contract rental no Inngår i kontrakt av typen
-parties rental no Kontraktsparter
-party_name rental no Navn til kontraktspart
-party rental no Kontraktspart
-party_back rental no Kontraktspartliste
-party_location rental no Intern organisasjonstilhørighet
-party_type rental no Type kontraktspart
-payer_id rental no Fakturamottaker
-percent rental no Prosent
-period rental no Periode
-permission_denied_edit_contract rental no Du mangler rettigheter
for å legge til å editere kontrakten
-permission_denied_new_contract rental no Du mangler rettigheter for å
legge til å opprette nye kontrakter
-permission_denied_view_contract rental no Du mangler rettigheter
for å legge til å se kontrakten
-permission_denied_add_document rental no Du mangler rettigheter for å
legge til et dokumenent
-phone rental no Telefon
-postal_code_place rental no Postnummer/-sted
-post_code rental no Postnummer
-post_place rental no Sted
-postal_code rental no Postnummer
-place rental no Sted
-previous rental no Forrige
-price_item rental no Priselement
-price_item_id rental no Priselement ID
-price_item_type_apiece rental no Stk.
-price_item_type_area rental no Areal
-price_item_inactive rental no Inaktiv
-price_item_active rental no Aktiv
-price_item_adjustable rental no Ja
-price_item_not_adjustable rental no Nei
-price_list rental no Prisbok
-price_per_unit rental no Pris pr kvm
-price rental no Pris
-price_element_in_use rental no Priselementet er i bruk på en aktiv
kontrakt
-project_id rental no Prosjektnummer
-Project id can not be more than 6 characters. rental no Prosjektnummer
kan ikke være mer enn seks tegn.
-propertyident rental no G.nr. / B.nr. / F.nr. / S.nr.
-property_id rental no BKB Identifikator
-property rental no Eiendom
-publish_comment rental no Kommentar vises i frontend
-quarterly rental no Kvartalvis
-rc rental no Leieobjekter
-recurrence rental no Gjentakelse
-reference rental no Deres ref
-regulation rental no Regulering
-regulation_back rental no Reguleringsliste
-related_delegates rental no Delegater
-remove rental no Fjern
-remove_from_workbench rental no Fjern fra mitt skrivebord
-remove_from_all_workbenches rental no Fjern fra alle skrivebord
-remove_location rental no Fjern enhet fra leieobjektet
-rental_composite rental no Leieobjekt
-Rental rental no Leie
-rented_area rental no Utleid areal
-rented_area_not_numeric rental no Areal må være et tall
-reports rental no Rapporter
-reset_price_item rental no Hent verdier fra prisboken
-reset rental no Nullstill
-reskontro rental no Reskontro
-responsibility rental no Ansvar
-responsibility_id rental no Ansvar
-Responsibility id must be 6 characters. rental no Ansvar må være
seks tegn.
-responsibility_id_not_numeric rental no Ansvar må være et tall
-result_unit_back rental no Resultatsliste
-result_unit rental no Resultatsenhet
-result_unit_number rental no Resultatsenhet
-Run rental no Kjørt
-run by rental no Utført av
-room rental no Rom
-running rental no Løpende
-save rental no Lagre
-save_setup rental no Lagre oppsett på forsiden
-search_for rental no Søk etter
-search_options rental no Søkevalg
-search rental no Søk
-search_where rental no i
-second_half rental no 2. halvår
-second_quarter rental no 2. kvartal
-section rental no Seksjon
-security rental no Sikkerhet
-security_amount rental no Sikkerhetsbeløp
-security_amount_not_numeric rental no Sikkerhetsbeløp må være et tall
-select_all_options rental no <Alle$gt;
-select_date rental no Velg dato
-select_date_valid_year rental no Vennligst velg et gyldig år
-selected_composites rental no Valgte leieobjekter
-selected_parties rental no Valgte kontraktsparter
-selected_price_items rental no Valgte priselementer
-serial rental no Løpenummer
-serial start rental no Start - ordrenummerserie
-serial stop rental no Slutt - ordrenummerserie
-service rental no Tjeneste
-service_id rental no Tjeneste
-Service id must be 5 characters. rental no Tjeneste må være fem
tegn.
-service_id_not_numeric rental no Tjeneste må være et tall
-service_exist rental no Eksisterer
-set_payer rental no Sett som fakturamottaker
-shortcuts rental no Snarveier
-show_affected_contracts rental no Vis kontrakter relatert til
reguleringen
-show_move_in_reports rental no Vis jasperreport for innflyttingsmelding
-show_move_out_reports rental no Vis jasperreport for utflyttingsmelding
-show_in_out_move_reports rental no Vis jasperreports for inn- og
utflyttingsmeldinger
-showing_composite rental no Leieobjekt
-showing_contract rental no Kontrakt
-showing rental no Viser priselement
-show rental no Vis
-shows_from rental no Viser fra
-ssn rental no Fødselsnummer
-started rental no Startet
-status_before rental no før
-status_date rental no den
-status_unknown rental no Ukjent status
-status rental no Status
-Success rental no Suksess
-success_create_user_based_on_email rental no En brukerkonto ble
opprettet og en e-post ble sendt til brukeren
-sum rental no Sum
-sync rental no Synkroniser
-sync_identifier rental no Kun identifikator
-sync_menu rental no Synkronisering
-sync_message rental no Melding
-sync_org_unit rental no Eksisterende kobling
-sync_resp_and_service rental no Ansvar
-sync_res_units rental no Gammelt resultatenhetsnummer
-sync_parties rental no Synkronisér kontraktsparter mot Fellesdata
-sync_parties_service_and_responsibiity rental no Synkronisering: Ansvar
(Kontrakt)
-sync_parties_result_unit_number rental no Synkronisering:
Resultatenhetsnummer (Kontraktspart)
-sync_parties_identifier rental no Synkronisering: Identifikator
-sync_parties_fellesdata_id rental no Synkronisering:
Organisasjonsidentifikator
-sync_org_name_fellesdata rental no Foretak i Fellesdata
-sync_org_email_fellesdata rental no Epost i Fellesdata
-sync_org_unit_leader_fellesdata rental no Enhetsleder i Fellesdata
-sync_org_department_fellesdata rental no Avdeling i Fellesdata
-syncronize_party rental no Synkroniser kontraktspart
-System setting for project id can not be more than 6 characters. rental
no Systeminnstilling for prosjektnummer kan ikke være mer enn seks tegn.
-System setting for responsibility id for the current user must be 6
characters. rental no Systeminnstilling for ansvar må være seks
tegn.
-target_me rental no Meg selv
-target_none rental no Ingen
-terminated_contract rental no Under opphør
-terminated_contracts rental no Opphørte kontrakter
-the period has been billed before. rental no Denne kontrakttypen med
denne faktureringsterminen har allerede blitt fakturert for denne perioden.
-thousands separator rental no Skilletegn for tusen
-third_quarter rental no 3. kvartal
-t_functions rental no Funksjoner
-title rental no Tittel
-t_new_composite rental no Opprett nytt leieobjekt
-t_new_contract rental no Ny kontrakt
-t_new_party rental no Opprett ny kontraktspart
-t_new_price_item rental no Opprett nytt priselement
-to rental no Til
-to_the_top rental no Til toppen
-Total sum rental no Totalt beløp
-total_price rental no Total pris
-total_price_current_year rental no Pris i budsjettperiode
-type rental no Type
-under_dismissal rental no Under oppsigelse
-under_planning rental no Under planlegging
-units rental no Enheter
-unit_id rental no Enhetsid
-unit_name rental no Enhetsnavn
-unit_leader_name rental no Navn enhetsleder
-unit_leader rental no Enhetsleder
-unit_no_of_delegates rental no Antall delegater
-update rental no Oppdatér
-upload rental no Last opp
-url rental no Nettsted
-Unable to get a location code for the building. rental no Klarte
ikke å hente objektnummer for bygget.
-unit_leader rental no Enhetsleder
-username rental no Brukernavn
-user_or_group rental no Bruker/Gruppe
-vacant rental no Ledig
-view_contract rental no Vis kontrakt
-unable_to_connect_to_database rental no Problemer med å koble til
databasen.
-unknown_user rental no Personen finnes ikke.
-user_found_in_Fellesdata rental no Personen finnes i Fellesdata.
-user_not_in_fellesdata rental no Personen finnes ikke i Fellesdata.
-user_found_in_PE rental no Personen er bruker av dette systemet.
-warning_billing_date_between rental no Fakturastart må være innenfor
kontraktens datoer!
-warning_due_date_between rental no Opsjonsfrist må være innenfor
kontraktens datoer!
-warning_lacking_start_date rental no Kontrakten mangler start-dato!
-warning_price_item_date_between rental no Priselementets datoer
må være innenfor kontraktens datoer!
-weekly rental no Ukentlig
-working_on rental no Kontrakter under arbeid
-year rental no År
-yes rental no Ja
-your_notifications rental no Dine varsler
-Download Excel export rental no Last ned eksportfil i Excel-format
-free_of_charge rental no Vederlagsfritt
\ No newline at end of file
+1-6 characters rental no 1-6 tegn
+6 characters rental no 6 tegn
+account_in rental no Art/konto inntektsside
+account_in_not_numeric rental no Art/konto inntektsside må være et tall
+account_number rental no Kontonummer
+account_out rental no Art/konto utgiftsside
+account_out_not_numeric rental no Art/konto utgiftsside må være
et tall
+active_party rental no Kontraktspart er aktiv
+active_plural rental no Aktive
+active_single rental no Aktiv
+active rental no Aktiv
+add_area rental no Legg til areal
+added_areas rental no Inkludert areal
+add rental no Legg til
+address rental no Adresse
+adjust_price rental no Juster pris
+adjustment rental no Regulering
+adjustable rental no Regulerbar
+adjustment_interval rental no Reguleringsintervall
+adjustment_is_executed rental no Reguleringen er utført
+adjustment_is_not_executed rental no Reguleringen er ikke utført
+adjustment_list rental no Reguleringer
+adjustment_list_out_of_date rental no Det er kjørt en nyere
regulering for samme utvalg av kontrakter
+adjustment_share rental no Reguleringsandel
+adjustment_type rental no Reguleringstype
+adjustment_year rental no Sist regulert
+adjustment_date rental no Reguleringsdato
+adjustment_type_KPI rental no KPI
+adjustment_type_deflator rental no Kommunal deflator
+advance rental no Forskudd
+agresso_id rental no Agresso-ID
+agresso_gl07 rental no Agresso GL07 - hovedbokstall
+agresso_lg04 rental no Agresso LG04 - salgsordrer
+add_location rental no Legg enhet til leieobjektet
+address1 rental no Adresse 1
+address2 rental no Adresse 2
+all rental no Alle
+all_locations rental no Enheter fra eiendomsregisteret
+and rental no og
+annually rental no Årlig
+area_gros rental no Bruttoareal
+area_net rental no Nettoareal
+area_not_found rental no Kunne ikke finne detaljer om arealet
+area rental no Areal
+area decimal places rental no Antall desimaler for arealer
+area suffix rental no Areal suffix
+area_max rental no Max areal
+audience rental no Målgrupper
+availability rental no Status
+availability_date rental no Dato
+available_areas rental no Tilgjenglig areal
+available_at rental no Ledig på dato
+available_composites rental no Ledige leieobjekt
+available_composites rental no Tilgjengelige leieobjekter
+available_from rental no Tilgjengelig fra
+available_parties rental no Tilgjengelige kontraktsparter
+available_price_items rental no Tilgjengelige priselementer
+available? rental no Kan leies ut?
+available rental no Tilgjengelig
+available_for_pick rental no tilgjengelig
+back rental no Tilbake
+bank_guarantee rental no Bankgaranti
+Billing date rental no Fakturadato
+billing time limit rental no Faktura - tidsgrense
+billing_external rental no Ekstern
+billing_internal rental no Intern
+billing_start rental no Fakturastart
+billing_end rental no Fakturastopp
+billing_term rental no Termin
+billing_terms rental no Terminer
+billing_unit rental no Ansvar-/tjenestested
+billing_removed_KF_contract rental no Fjernet KF-kontrakt med id
+billing_removed_contract_part_1 rental no Fjernet kontrakt
+billing_removed_contract_part_2 rental no med total pris lik 0
kroner
+billing_removed_external_contract rental no Kontrakt med
ansvarsområde eksternleie må ha kontrakttype
+bill rental no Faktura
+bill2 rental no Fakturér
+btn_add rental no Deleger tilgang til bruker
+btn_search rental no Finn bruker
+building rental no Bygg
+calculations_internal_investment rental no Beregningsgrunnlag
internleie/investeringer
+calculate_price_apiece rental no Pris regnes per stk.
+calculate_price_per_area rental no Pris regnes ut fra areal
+calendar_months rental no
["Januar","Februar","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"]
+calendar_weekdays rental no ["Sø","Ma","Ti","On","To","Fr","Lø"]
+cancel rental no Avbryt
+category config move in rental no Kategori for
innflyttingsmeldinger
+category config move out rental no Kategori for
utflyttingsmeldinger
+close rental no Lukk
+clear rental no Nullstill
+closing_due_date rental no Nær opsjonsfrist
+CSV rental no CSV
+comment rental no Kommentar
+comments rental no Kommentarer
+Commit rental no Avslutt
+Commited rental no Avsluttet
+company rental no Foretak
+company_name rental no Foretak
+composite_name rental no Navn på leieobjekt
+composite_address rental no Adresse på leieobjekt
+composite rental no Leieobjekt
+composite_back rental no Leieobjektsliste
+composite_has_contract rental no Leieobjekt med aktive kontrakter
+composite_has_no_contract rental no Leieobjekt uten aktive
kontrakter
+composite standard rental no Leieobjekt standard
+factor common no Faktor
+contract rental no Kontrakt
+contract_back rental no Kontraktsliste
+contract_id rental no Kontraktsnummer
+contract_not_adjustable rental no Kontrakten er ikke regulerbar
+contract_number rental no Kontraktnummer
+contract_warning rental no Advarsler
+contracts_containing_this_composite rental no Kontrakter knyttet til
dette leieobjektet
+contracts rental no Kontrakter
+contracts_under_dismissal rental no Kontrakter under avslutning
+contract_under_dismissal rental no Under avslutning
+contract_notifications rental no Kontraktens varsler
+contract_notification_status rental no Status
+contracts_for_regulation rental no Regulering med tilhørende
kontrakter
+contract_regulation_back rental no Regulering
+contracts_removed rental no Kontrakter som er fjernet fra
fakturakjøringen
+contracts_with_one_time rental no Kontrakter med engangsbeløp
+contracts_in_cycle rental no Kontrakter som følger vanlig
fakturasyklus
+contracts_out_of_cycle rental no Kontrakter som avviker fra vanlig
faktureringssyklus
+contracts_not_billed_before rental no Kontrakter som ikke er
fakturert tidligere
+contract_status rental no Status
+contract_type_eksternleie rental no Eksternleie
+contract_type_eksternleie_feste rental no Feste (1520)
+contract_type_eksternleie_leilighet rental no Leilighet (1530)
+contract_type_eksternleie_annen rental no Annen (1510)
+contract_type_innleie rental no Innleie
+contract_type_internleie rental no Internleie
+contract_type_internleie_egne rental no Egne
+contract_type_internleie_innleie rental no Innleie
+contract_type_internleie_investeringskontrakt rental no
Investeringskontrakt
+contract_type_internleie_KF rental no KF
+contract_type_internleie_andre rental no Andre
+contract_type_investeringskontrakt rental no Investeringskontrakt
+contract_type rental no Kontrakttype
+contract_type_id rental no Kontrakttype
+contract_types rental no Kontrakttyper
+contract_type_internleie_1 rental no Utført internleieregulering av
kontrakter som reguleres hvert år
+contract_type_internleie_2 rental no Utført internleieregulering av
kontrakter som reguleres hvert annet år
+contract_type_internleie_10 rental no Utført internleieregulering av
kontrakter som reguleres hvert tiende år
+contract_type_innleie_1 rental no Utført innleieregulering av
kontrakter som reguleres hvert år
+contract_type_innleie_2 rental no Utført innleieregulering av
kontrakter som reguleres hvert annet år
+contract_type_innleie_10 rental no Utført innleieregulering av
kontrakter som reguleres hvert tiende år
+contract_type_eksternleie_1 rental no Utført eksternleieregulering av
kontrakter som reguleres hvert år
+contract_type_eksternleie_2 rental no Utført eksternleieregulering av
kontrakter som reguleres hvert annet år
+contract_type_eksternleie_10 rental no Utført eksternleieregulering av
kontrakter som reguleres hvert tiende år
+contracts_closing_due_date rental no Kontrakter nær opsjonsfrist
+contract_future_info rental no Fremtidig kontraktsinformasjon
+Could not find specified billing job. rental no Kunne ikke finne
spesifisert fakturering.
+count decimal places rental no Antall desimaler for opptelling
+count rental no Antall
+count_suffix rental no stk
+count_suffix rental no stk
+create_billing rental no Opprett fakturakjøring
+create_shortcut rental no Ny snarvei
+create_contract_contract_type_eksternleie rental no Opprett
eksternleiekontrakt
+create_contract_contract_type_innleie rental no Opprett innleiekontrakt
+create_contract_contract_type_internleie rental no Opprett
internleiekontrakt
+create_user_based_on_email_link rental no Opprett bruker basert
på e-post
+create user based on email group rental no Velg gruppe nye brukere
blir innmeldt i
+cs15_export rental no Kundefil
+currency decimal places rental no Antall desimaler for valuta
+currency prefix rental no Valuta prefix
+currency suffix rental no Valuta suffix
+currency_thousands_separator rental no .
+custom_address rental no overstyrt
+dashboard_title rental no Forside - Min arbeidsoversikt
+DATATABLE_MSG_EMPTY rental no Ingen data
+DATATABLE_MSG_ERROR rental no Datafeil
+DATATABLE_MSG_LOADING rental no Laster data
+date_end rental no Gjelder til
+date rental no Dato
+date_start rental no Gjelder fra
+decimal separator rental no Skilletegn for desimaler
+delegates rental no Delegering
+delegate_removed rental no Delegaten ble fjernet.
+delegation_error rental no Feil under delegering
+delegation_successful rental no Velykket delegering
+delete rental no Slett
+department rental no Avdeling
+deposit rental no Depositum
+description rental no Beskrivelse
+details rental no Detaljer
+document_type rental no Dokumenttype
+documents rental no Dokumenter
+Download Agresso import file rental no Last ned Agresso-importfil
(CS15)
+Download as %1 rental no Last tabellen i %1-format
+Download export rental no Last ned eksporten
+do_not_exist rental no Eksisterer ikke
+due_date rental no Opsjonsfrist
+economy rental no Økonomi
+edit_contract rental no Redigér kontrakt
+edit rental no Redigér
+elements_pr_page rental no elementer per side
+elements rental no Elementer
+email rental no E-post
+email_create_user_based_on_email_title rental no Tilgang til Portico
Estate
+email_create_user_based_on_email_message rental no Hei %1
%2:<br/>Det er opprettet en tilgang for deg i Portico
Estate<br/><br/>Brukernavnet er e-posten din<br/>Passordet er
%3<br/><br/>Systemet kan nås på adressen %4
+ended rental no Avsluttet
+entity config move out rental no Entitet for utflytting
+entity config move in rental no Entitet for innflytting
+error_create_user_based_on_email rental no En feil oppstod under
opprettelse av bruker
+error_create_user_based_on_email_account_exist rental no En konto med
denne e-posten som brukernavn eksisterer allerede
+error_create_user_based_on_email_not_valid_address rental no Kan
ikke opprette kontoen pga av e-postadressen ikke er gyldig
+error_no_contract_or_party rental no Ingen kontrakt eller
kontraktspart å utføre handlingen på
+events rental no Hendelser
+every_second_week rental no Hver 14. dag
+Excel rental no Excel
+execute_adjustments rental no Utfør reguleringer
+executive_officer rental no Saksbehandler
+executive_officer_for rental no Saksbehandler for
+export rental no Eksport
+export_contracts rental no Eksporter kontrakter
+export_contract_price_items rental no Eksporter priselementer på
kontrakter
+Export failed. rental no Eksporten feilet.
+Export format rental no Format
+Export generated. rental no Eksporten ble generert.
+export_to rental no Eksporter
+external rental no Eksterne kontraktsparter
+facilit_import rental no Import fra Facilit
+failed_removing_delegate rental no Det oppstod en feil under
sletting av delegaten.
+fax rental no Faks
+fellesdata_not_in_use rental no Fellesdata er ikke i bruk
+field_of_responsibility rental no Ansvarsområde
+filters rental no Filtre
+Finish rental no Avslutt
+fire_drawings rental no Branntegninger
+firstname rental no Fornavn
+first rental no Første
+first_half rental no 1. halvår
+first_quarter rental no 1. kvartal
+fixed rental no Tidsbestemt
+floor rental no Etasje
+fourth_quarter rental no 4. kvartal
+f_new_contract rental no Opprett kontrakt
+f_new_party rental no Ny kontraktspart
+f_new_price_item rental no Nytt priselement
+f_new_rc rental no Nytt leieobjekt
+from rental no Fra
+from email setting rental no E-post adresse systemmeldinger (Fra)
+frontpage_was_reset rental no Oppsettet på forsiden ble nullstilt
+frontpage_reset_setup rental no Nullstill oppsett
+frontend_access rental no Gå til frontend som valgt leietaker
+f_select_columns rental no Velg kolonner
+furnish_type rental no Møbleringsstatus
+furnish_type_not_specified rental no Ikke spesifisert
+furnish_type_furnished rental no Møblert
+furnish_type_partly_furnished rental no Delvis møblert
+furnish_type_not_furnished rental no Ikke møblert
+gab rental no GAB
+gab_id rental no GAB
+Generate export rental no Generér eksport
+Generate cs15 rental no Generér kundefil
+get_sync_data rental no Hent data fra Fellesdata
+half-year rental no Halvårig
+hidden rental no Skjult
+hidden_for_pick rental no skjult
+has_custom_address rental no Er adressen overstyrt?
+house_number rental no Husnummer
+http address for external users rental no HTTP adresse for
eksterne brukere
+id rental no ID
+Identifier rental no Identifikator
+import_log_messages rental no Import log
+import_reset rental no Nullstill importstatus
+in_operation rental no I drift
+inactive_party rental no Kontraktspart er inaktiv
+inactive rental no Inaktiv
+included_units rental no Leieobjektets enheter
+internal rental no Interne kontraktsparter
+interval rental no Intervall
+Invalid location code for the building. rental no Ugyldig
objektnummer for bygg.
+invoice rental no Faktura
+invoice_run rental no Fakturakjøring
+invoice_menu rental no Faktura
+invoice_header rental no Fakturaoverskrift
+is_active rental no Aktiv
+is_area rental no Areal
+is_payer rental no Fakturamottaker
+is_inactive rental no Inaktiv
+is_adjustable rental no Indeksreguleres
+is_executed rental no Utført
+is_one_time rental no Engangsbeløp
+is_standard rental no Standard priselement
+job_title rental no Stillingstittel
+land_title rental no Gnr/Bnr
+lacking_username rental no Brukernavn må fylles ut
+last_edited_by_current_user rental no Din siste endring
+lastname rental no Etternavn
+last rental no Siste
+last_updated rental no Sist oppdatert
+level rental no Nivå
+link rental no Lenke
+location_code rental no Enhetsnummer
+location_id rental no Intern organisasjonstilknytning
+log_in_to_add_notfications rental no Det er bare mulig å legge til
varlser i redigeringsmodus.
+make_pdf rental no Lag PDF for utskrift
+manual_adjust_price_item rental no Manuell regulering av
priselement
+manual_adjust_price_item_select rental no Velg priselement
+manual_adjustment rental no Manuell regulering
+marked_as rental no og er merket
+max_area rental no Areal
+message rental no Melding
+messages_agresso_id_length rental no Agresso-ID må inneholde 9 tall
eller bokstaver
+messages_fontpage_not_saved rental no Oppsettet ble ikke lagret
+messages_fontpage_saved rental no Oppsettet ble lagret
+messages_form_error rental no Skjemaet inneholder en feil.
+messages_general rental no Feil i feltet
+messages_isint rental no Feltet må inneholde et heltall
+messages_isnumeric rental no Feltet må inneholde et tall
+messages_new_composite rental no Leieobjektet er opprettet
+messages_new_contract rental no Ny kontrakt lagt til
+messages_new_contract_copied rental no Ny kontrakt lagt til basert på
kontrakt
+messages_new_contract_from_composite rental no Ny kontrakt lagt til
basert på leieobjekt
+messages_new_party rental no Kontraktspart er opprettet
+messages_not_valid_date rental no Må være en gyldig dato
+messages_number_out_of_range rental no Tallet er over eller under
tillatte verdier
+messages_required_field rental no Dette feltet er påkrevd
+messages_right_click_to_add rental no Høyreklikk for å legge til
+messages_saved_form rental no Informasjonen ble lagret.
+messages_string_too_long rental no Teksten er for lang
+Missing account in. rental no Inngående konto mangler.
+Missing account out. rental no Utgående konto mangler.
+Missing billing information. rental no Ufullstendig
konteringsinformasjon for kontrakt med id %1. Dette må rettes for å kunne
fakturere kontrakten.
+Missing contract party. rental no Kontraktspart mangler.
+Missing payer id. rental no Mangler fakturamottaker.
+Missing project id. rental no Prosjektnummer mangler.
+Missing responsibility id. rental no Ansvar mangler.
+Missing service id. rental no Tjeneste mangler.
+Missing system setting for project id. rental no Systeminnstilling for
prosjektnummer mangler.
+Missing system setting for responsibility id for the current user. rental
no Systeminnstilling for ansvar mangler.
+missing_agresso_id rental no Agresso Id må fylles ut
+mobile_phone rental no Mobiltelefon
+month 1 rental no januar
+month 2 rental no februar
+month 3 rental no mars
+month 4 rental no april
+month 5 rental no mai
+month 6 rental no juni
+month 7 rental no juli
+month 8 rental no august
+month 9 rental no september
+month 10 rental no oktober
+month 11 rental no november
+month 12 rental no desember
+month 0 capitalized rental no Ikke tilgjengelig
+month 1 capitalized rental no Januar
+month 2 capitalized rental no Februar
+month 3 capitalized rental no Mars
+month 4 capitalized rental no April
+month 5 capitalized rental no Mai
+month 6 capitalized rental no Juni
+month 7 capitalized rental no Juli
+month 8 capitalized rental no August
+month 9 capitalized rental no September
+month 10 capitalized rental no Oktober
+month 11 capitalized rental no November
+month 12 capitalized rental no Desember
+monthly rental no Månedlig
+month rental no Måned
+name rental no Navn
+never rental no Aldri
+new_notification rental no Nytt varsel
+new_billing rental no Ny fakturering
+new_adjustment rental no Ny regulering
+new_price rental no Ny pris
+next rental no Neste
+no rental no Nei
+none rental no Ingen
+nobody rental no Ingen
+No billing jobs found rental no Ingen faktureringer funnet
+no_contracts_found rental no Ingen kontrakter passet til
søkekriteriene
+No contracts were selected. rental no Du må velge minst én kontrakt
for å faktuere.
+no_hits rental no Ingen treff
+No invoices were found rental no Ingen fakturaer funnet
+no_name_composite rental no Leieobjekt uten navn (løpenummer: %1)
+no_party_location rental no Ingen intern organisasjonstilhørighet
+no_value rental no Ingen
+not_available rental no Ikke tilgjengelig
+notification_status rental no Varsel
+notifications rental no Varsler
+notification_optgroup_groups rental no Grupper
+notification_optgroup_users rental no Brukere
+not_started rental no Ikke startet
+not_available_nor_hidden rental no tilgjengelig eller skjult
+object_number rental no Objektnummer
+objno_name_address rental no Objektnummer/navn/adresse
+occupied rental no Opptatt
+of_total rental no av totalt
+ok rental no Ok
+old_contract_id rental no Gammelt kontraktsnummer
+ODS rental no ODS
+One or more price items are missing Agresso ids. rental no Ett
eller flere priselementer mangler Agresso-id.
+One or more price items have an invalid Agresso id. Id must consist of one
capital letter and three digits. rental no Ett eller flere
priselementer har en ugyldig Agresso-id. Iden må bestå av én stor bokstav og
tre tall.
+only_one_time rental no Status
+only_one_time_yes rental no Avviker fra vanlig faktureringssyklus,
kun engangsbeløp
+only_one_time_no rental no Følger vanlig fakturasyklus
+open_and_exported_exist rental no En fakturakjøring som ikke er
avsluttet med eksportert til Agresso-format eksisterer for dette
ansvarsområdet. Denne må enten slettes eller avsluttes før denne
fakturakjøringen kan eksportes.
+organisation_number rental no Organisasjonsnummer
+organisation_or_ssn_number rental no Org./fødselsnr
+orphan_units rental no Ubrukte arealer
+or rental no eller
+org_enhet_id rental no Organisasjonsenhet
+org_unit_name rental no Navn på tilsvarende enhet i Fellesdata
+org_unit_exist rental no Eksisterer
+other_guarantee rental no Annen garanti
+others rental no Annet
+out_of_operation rental no Ikke i drift
+overridden_address rental no Overstyrt adresse
+override rental no Fakturer fra
+panels rental no Vinduer
+part_of_contract rental no Inngår i kontrakt av typen
+parties rental no Kontraktsparter
+party_name rental no Navn til kontraktspart
+party rental no Kontraktspart
+party_back rental no Kontraktspartliste
+party_location rental no Intern organisasjonstilhørighet
+party_type rental no Type kontraktspart
+payer_id rental no Fakturamottaker
+percent rental no Prosent
+period rental no Periode
+permission_denied_edit_contract rental no Du mangler rettigheter
for å legge til å editere kontrakten
+permission_denied_new_contract rental no Du mangler rettigheter for å
legge til å opprette nye kontrakter
+permission_denied_view_contract rental no Du mangler rettigheter
for å legge til å se kontrakten
+permission_denied_add_document rental no Du mangler rettigheter for å
legge til et dokumenent
+phone rental no Telefon
+postal_code_place rental no Postnummer/-sted
+post_code rental no Postnummer
+post_place rental no Sted
+postal_code rental no Postnummer
+place rental no Sted
+previous rental no Forrige
+price_item rental no Priselement
+price_item_id rental no Priselement ID
+price_item_type_apiece rental no Stk.
+price_item_type_area rental no Areal
+price_item_inactive rental no Inaktiv
+price_item_active rental no Aktiv
+price_item_adjustable rental no Ja
+price_item_not_adjustable rental no Nei
+price_list rental no Prisbok
+price_per_unit rental no Pris pr kvm
+price rental no Pris
+price_element_in_use rental no Priselementet er i bruk på en aktiv
kontrakt
+project_id rental no Prosjektnummer
+Project id can not be more than 6 characters. rental no Prosjektnummer
kan ikke være mer enn seks tegn.
+propertyident rental no G.nr. / B.nr. / F.nr. / S.nr.
+property_id rental no BKB Identifikator
+property rental no Eiendom
+publish_comment rental no Kommentar vises i frontend
+quarterly rental no Kvartalvis
+rc rental no Leieobjekter
+recurrence rental no Gjentakelse
+reference rental no Deres ref
+regulation rental no Regulering
+regulation_back rental no Reguleringsliste
+related_delegates rental no Delegater
+remove rental no Fjern
+remove_from_workbench rental no Fjern fra mitt skrivebord
+remove_from_all_workbenches rental no Fjern fra alle skrivebord
+remove_location rental no Fjern enhet fra leieobjektet
+rental_composite rental no Leieobjekt
+Rental rental no Leie
+rented_area rental no Utleid areal
+rented_area_not_numeric rental no Areal må være et tall
+reports rental no Rapporter
+reset_price_item rental no Hent verdier fra prisboken
+reset rental no Nullstill
+reskontro rental no Reskontro
+responsibility rental no Ansvar
+responsibility_id rental no Ansvar
+Responsibility id must be 6 characters. rental no Ansvar må være
seks tegn.
+responsibility_id_not_numeric rental no Ansvar må være et tall
+result_unit_back rental no Resultatsliste
+result_unit rental no Resultatsenhet
+result_unit_number rental no Resultatsenhet
+Run rental no Kjørt
+run by rental no Utført av
+room rental no Rom
+running rental no Løpende
+save rental no Lagre
+save_setup rental no Lagre oppsett på forsiden
+search_for rental no Søk etter
+search_options rental no Søkevalg
+search rental no Søk
+search_where rental no i
+second_half rental no 2. halvår
+second_quarter rental no 2. kvartal
+section rental no Seksjon
+security rental no Sikkerhet
+security_amount rental no Sikkerhetsbeløp
+security_amount_not_numeric rental no Sikkerhetsbeløp må være et tall
+select_all_options rental no <Alle$gt;
+select_date rental no Velg dato
+select_date_valid_year rental no Vennligst velg et gyldig år
+selected_composites rental no Valgte leieobjekter
+selected_parties rental no Valgte kontraktsparter
+selected_price_items rental no Valgte priselementer
+serial rental no Løpenummer
+serial start rental no Start - ordrenummerserie
+serial stop rental no Slutt - ordrenummerserie
+service rental no Tjeneste
+service_id rental no Tjeneste
+Service id must be 5 characters. rental no Tjeneste må være fem
tegn.
+service_id_not_numeric rental no Tjeneste må være et tall
+service_exist rental no Eksisterer
+set_payer rental no Sett som fakturamottaker
+shortcuts rental no Snarveier
+show_affected_contracts rental no Vis kontrakter relatert til
reguleringen
+show_move_in_reports rental no Vis jasperreport for innflyttingsmelding
+show_move_out_reports rental no Vis jasperreport for utflyttingsmelding
+show_in_out_move_reports rental no Vis jasperreports for inn- og
utflyttingsmeldinger
+showing_composite rental no Leieobjekt
+showing_contract rental no Kontrakt
+showing rental no Viser priselement
+show rental no Vis
+shows_from rental no Viser fra
+ssn rental no Fødselsnummer
+started rental no Startet
+status_before rental no før
+status_date rental no den
+status_unknown rental no Ukjent status
+status rental no Status
+Success rental no Suksess
+success_create_user_based_on_email rental no En brukerkonto ble
opprettet og en e-post ble sendt til brukeren
+sum rental no Sum
+sync rental no Synkroniser
+sync_identifier rental no Kun identifikator
+sync_menu rental no Synkronisering
+sync_message rental no Melding
+sync_org_unit rental no Eksisterende kobling
+sync_resp_and_service rental no Ansvar
+sync_res_units rental no Gammelt resultatenhetsnummer
+sync_parties rental no Synkronisér kontraktsparter mot Fellesdata
+sync_parties_service_and_responsibiity rental no Synkronisering: Ansvar
(Kontrakt)
+sync_parties_result_unit_number rental no Synkronisering:
Resultatenhetsnummer (Kontraktspart)
+sync_parties_identifier rental no Synkronisering: Identifikator
+sync_parties_fellesdata_id rental no Synkronisering:
Organisasjonsidentifikator
+sync_org_name_fellesdata rental no Foretak i Fellesdata
+sync_org_email_fellesdata rental no Epost i Fellesdata
+sync_org_unit_leader_fellesdata rental no Enhetsleder i Fellesdata
+sync_org_department_fellesdata rental no Avdeling i Fellesdata
+syncronize_party rental no Synkroniser kontraktspart
+System setting for project id can not be more than 6 characters. rental
no Systeminnstilling for prosjektnummer kan ikke være mer enn seks tegn.
+System setting for responsibility id for the current user must be 6
characters. rental no Systeminnstilling for ansvar må være seks
tegn.
+target_me rental no Meg selv
+target_none rental no Ingen
+terminated_contract rental no Under opphør
+terminated_contracts rental no Opphørte kontrakter
+the period has been billed before. rental no Denne kontrakttypen med
denne faktureringsterminen har allerede blitt fakturert for denne perioden.
+thousands separator rental no Skilletegn for tusen
+third_quarter rental no 3. kvartal
+t_functions rental no Funksjoner
+title rental no Tittel
+t_new_composite rental no Opprett nytt leieobjekt
+t_new_contract rental no Ny kontrakt
+t_new_party rental no Opprett ny kontraktspart
+t_new_price_item rental no Opprett nytt priselement
+to rental no Til
+to_the_top rental no Til toppen
+Total sum rental no Totalt beløp
+total_price rental no Total pris
+total_price_current_year rental no Pris i budsjettperiode
+type rental no Type
+under_dismissal rental no Under oppsigelse
+under_planning rental no Under planlegging
+units rental no Enheter
+unit_id rental no Enhetsid
+unit_name rental no Enhetsnavn
+unit_leader_name rental no Navn enhetsleder
+unit_leader rental no Enhetsleder
+unit_no_of_delegates rental no Antall delegater
+update rental no Oppdatér
+upload rental no Last opp
+url rental no Nettsted
+Unable to get a location code for the building. rental no Klarte
ikke å hente objektnummer for bygget.
+unit_leader rental no Enhetsleder
+username rental no Brukernavn
+user_or_group rental no Bruker/Gruppe
+vacant rental no Ledig
+view_contract rental no Vis kontrakt
+unable_to_connect_to_database rental no Problemer med å koble til
databasen.
+unknown_user rental no Personen finnes ikke.
+user_found_in_Fellesdata rental no Personen finnes i Fellesdata.
+user_not_in_fellesdata rental no Personen finnes ikke i Fellesdata.
+user_found_in_PE rental no Personen er bruker av dette systemet.
+warning_billing_date_between rental no Fakturastart må være innenfor
kontraktens datoer!
+warning_billing_end_date_between rental no Fakturastopp må være
innenfor kontraktens datoer!
+warning_due_date_between rental no Opsjonsfrist må være innenfor
kontraktens datoer!
+warning_lacking_start_date rental no Kontrakten mangler start-dato!
+warning_price_item_date_between rental no Priselementets datoer
må være innenfor kontraktens datoer!
+weekly rental no Ukentlig
+working_on rental no Kontrakter under arbeid
+year rental no År
+yes rental no Ja
+your_notifications rental no Dine varsler
+Download Excel export rental no Last ned eksportfil i Excel-format
+free_of_charge rental no Vederlagsfritt
+extra_adjustment rental no Ekstra regulering
+free_of_charge rental no Vederlagsfritt
Modified: branches/Version-1_0-branch/rental/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/setup.inc.php 2014-09-09
11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/setup/setup.inc.php 2014-09-09
14:02:27 UTC (rev 12087)
@@ -1,6 +1,6 @@
<?php
$setup_info['rental']['name'] = 'rental'; // Module
identifier
- $setup_info['rental']['version'] = '0.1.0.18'; // Current module
version
+ $setup_info['rental']['version'] = '0.1.0.20'; // Current module
version
$setup_info['rental']['app_order'] = 51; // (?)
$setup_info['rental']['tables'] = array(
'rental_party', // All
contract participants, tenants etc.
Modified: branches/Version-1_0-branch/rental/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/tables_current.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/setup/tables_current.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -110,7 +110,8 @@
'id' =>
array('type' => 'int', 'precision' => '4', 'nullable' => false),
'date_start' => array('type' =>
'int', 'precision' => '8', 'nullable' => true),
'date_end' => array('type' =>
'int', 'precision' => '8', 'nullable' => true),
- 'billing_start' => array('type' =>
'int', 'precision' => '8', 'nullable' => true),
+ 'billing_start' => array('type' =>
'int', 'precision' => '8', 'nullable' => true),
+ 'billing_end' => array('type' =>
'int', 'precision' => '8', 'nullable' => true),
'location_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => false), // Contract type
'term_id' => array('type' =>
'int', 'precision' => '4', 'nullable' => true),
'security_type' => array('type' =>
'int', 'precision' => '4', 'nullable' => true),
@@ -456,6 +457,7 @@
'percent' =>
array('type' => 'decimal', 'precision' => '20','scale' => '2', 'nullable' =>
true),
'adjustment_interval' => array('type' =>
'int', 'precision' => '4', 'nullable' => true),
'is_manual' =>
array('type' => 'bool','nullable' => false,'default' => 'false'),
+ 'extra_adjustment' =>
array('type' => 'bool','nullable' => false,'default' => 'false'),
'is_executed' =>
array('type' => 'bool','nullable' => false,'default' => 'false')
),
'pk' => array('id'),
Modified: branches/Version-1_0-branch/rental/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/tables_update.inc.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/setup/tables_update.inc.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -341,3 +341,30 @@
return $GLOBALS['setup_info']['rental']['currentver'];
}
+ $test[] = '0.1.0.18';
+ function rental_upgrade0_1_0_18()
+ {
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('rental_contract','billing_end',array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => 'True'
+ ));
+
+ $GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.19';
+ return $GLOBALS['setup_info']['rental']['currentver'];
+ }
+
+ $test[] = '0.1.0.19';
+ function rental_upgrade0_1_0_19()
+ {
+ // Add unit_leader column
+ $GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment',
'extra_adjustment', array(
+ 'type' => 'bool',
+ 'nullable' => true,
+ 'default' => 'false'
+ ));
+
+ $GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.20';
+ return $GLOBALS['setup_info']['rental']['currentver'];
+ }
Modified: branches/Version-1_0-branch/rental/templates/base/adjustment.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/adjustment.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/templates/base/adjustment.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -113,6 +113,16 @@
}
?>
</dd>
+ <dt>
+ <label for="extra_adjustment"><?php echo
lang('extra_adjustment')?></label>
+ </dt>
+ <dd>
+ <?php if($editable){?>
+ <input type="checkbox" name="extra_adjustment"
id="extra_adjustment"<?php echo $adjustment->is_extra_adjustment() ? '
checked="checked"' : '' ?>/>
+ <?php }else{?>
+ <input type="checkbox" name="extra_adjustment"
id="extra_adjustment"<?php echo $adjustment->is_extra_adjustment() ? '
checked="checked"' : '' ?> disabled="disabled"/>
+ <?php }?>
+ </dd>
<dt>
<?php if($adjustment->is_executed()){?>
<label for="is_executed"><?php echo
lang("adjustment_is_executed")?></label>
Modified:
branches/Version-1_0-branch/rental/templates/base/adjustment_list_partial.php
===================================================================
---
branches/Version-1_0-branch/rental/templates/base/adjustment_list_partial.php
2014-09-09 11:11:24 UTC (rev 12086)
+++
branches/Version-1_0-branch/rental/templates/base/adjustment_list_partial.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -75,6 +75,11 @@
label: "<?php echo lang('responsibility') ?>",
sortable: true
},
+ {
+ key: "extra_adjustment",
+ label: "<?php echo lang('extra_adjustment')?>",
+ sortable: true
+ },
{
key: "is_executed",
label: "<?php echo lang('is_executed')?>",
@@ -129,4 +134,4 @@
</script>
<div id="<?php echo $list_id ?>_paginator" class="paginator"></div>
-<div id="<?php echo $list_id ?>_container" class="datatable_container"></div>
+<div id="<?php echo $list_id ?>_container" class="datatable_container"></div>
Modified:
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.php
===================================================================
---
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.php
2014-09-09 11:11:24 UTC (rev 12086)
+++
branches/Version-1_0-branch/rental/templates/base/composite_list_partial.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -122,10 +122,15 @@
function composite_export(compType) {
var availabilityselect = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_active_rental_composites');
var availabilityoption =
availabilityselect.options[availabilityselect.selectedIndex].value;
-
+<?php
+ if(isset($config->config_data['contract_future_info']) &&
$config->config_data['contract_future_info'])
+ {
+?>
var furnished_select = document.getElementById('<?php echo $list_id
?>_ctrl_toggle_furnished_status_rental_composites');
var furnished_status_id =
furnished_select.options[furnished_select.selectedIndex].value;
-
+<?php
+ }
+?>
var query = document.getElementById('<?php echo $list_id
?>_ctrl_search_query').value;
var sSelect = document.getElementById('<?php echo $list_id
?>_ctrl_search_option');
Modified: branches/Version-1_0-branch/rental/templates/base/contract.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/contract.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/templates/base/contract.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -369,12 +369,14 @@
</dt>
<dd>
<?php
- $start_date =
$contract->get_contract_date() &&
$contract->get_contract_date()->has_start_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_contract_date()->get_start_date()) : '-';
- $start_date_yui =
$contract->get_contract_date() &&
$contract->get_contract_date()->has_start_date() ? date('Y-m-d',
$contract->get_contract_date()->get_start_date()) : '';
- $start_date_cal =
$GLOBALS['phpgw']->yuical->add_listener('date_start', $start_date);?>
- <?php if ($editable) {
- echo
$start_date_cal;
- } else {
+ $start_date =
$contract->get_contract_date() &&
$contract->get_contract_date()->has_start_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_contract_date()->get_start_date()) : '';
+ $start_date_yui =
$contract->get_contract_date() &&
$contract->get_contract_date()->has_start_date() ?
$GLOBALS['phpgw']->common->show_date($contract->get_contract_date()->get_start_date())
: '';
+ if ($editable)
+ {
+ echo
$GLOBALS['phpgw']->jqcal->add_listener('date_start', 'date', $start_date);
+ }
+ else
+ {
echo
$start_date;
}
?>
@@ -385,15 +387,17 @@
</dt>
<dd>
<?php
- $end_date =
$contract->get_contract_date() &&
$contract->get_contract_date()->has_end_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_contract_date()->get_end_date()) : '-';
- $end_date_yui =
$contract->get_contract_date() &&
$contract->get_contract_date()->has_end_date() ? date('Y-m-d',
$contract->get_contract_date()->get_end_date()) : '';
- $end_date_cal =
$GLOBALS['phpgw']->yuical->add_listener('date_end', $end_date);
- ?>
- <?php if ($editable) {
- echo
$end_date_cal;
- } else {
+ $end_date =
$contract->get_contract_date() &&
$contract->get_contract_date()->has_end_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_contract_date()->get_end_date()) : '';
+ $end_date_yui =
$contract->get_contract_date() &&
$contract->get_contract_date()->has_end_date() ?
$GLOBALS['phpgw']->common->show_date($contract->get_contract_date()->get_end_date())
: '';
+ if ($editable)
+ {
+ echo
$GLOBALS['phpgw']->jqcal->add_listener('date_end', 'date', $end_date);
+ }
+ else
+ {
echo $end_date;
- }?>
+ }
+ ?>
<br/>
</dd>
<dt>
@@ -401,11 +405,15 @@
</dt>
<dd>
<?php
- $due_date =
$contract->get_due_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_due_date()) : '-';
- $due_date_yui =
$contract->get_due_date() ? date('Y-m-d', $contract->get_due_date()) : '';
- if ($editable) {
- echo
$GLOBALS['phpgw']->yuical->add_listener('due_date', $due_date);
- } else {
+ $due_date =
$contract->get_due_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_due_date()) : '';
+ $due_date_yui =
$contract->get_due_date() ?
$GLOBALS['phpgw']->common->show_date($contract->get_due_date()) : '';
+ if ($editable)
+ {
+ echo
$GLOBALS['phpgw']->jqcal->add_listener('due_date', 'date', $due_date);
+ // echo
$GLOBALS['phpgw']->yuical->add_listener('due_date', $due_date);
+ }
+ else
+ {
echo $due_date;
}
?>
@@ -459,16 +467,38 @@
</dt>
<dd>
<?php
- $billing_start_date =
$contract->get_billing_start_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_billing_start_date()) : '-';
- $billing_start_date_yui
= $contract->get_billing_start_date() ? date('Y-m-d',
$contract->get_billing_start_date()) : '';
- if ($editable) {
- echo
$GLOBALS['phpgw']->yuical->add_listener('billing_start_date',
$billing_start_date);
- } else {
+ $billing_start_date =
$contract->get_billing_start_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_billing_start_date()) : '';
+ $billing_start_date_yui
= $contract->get_billing_start_date() ?
$GLOBALS['phpgw']->common->show_date($contract->get_billing_start_date()) : '';
+ if ($editable)
+ {
+// echo
$GLOBALS['phpgw']->yuical->add_listener('billing_start_date',
$billing_start_date);
+ echo
$GLOBALS['phpgw']->jqcal->add_listener('billing_start_date', 'date',
$billing_start_date);
+ }
+ else
+ {
echo
$billing_start_date;
}
?>
</dd>
<dt>
+ <label
for="billing_end_date"><?php echo lang('billing_end') ?></label>
+ </dt>
+ <dd>
+ <?php
+ $billing_end_date =
$contract->get_billing_end_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$contract->get_billing_end_date()) : '';
+ $billing_end_date_yui =
$contract->get_billing_end_date() ?
$GLOBALS['phpgw']->common->show_date($contract->get_billing_end_date()) : '';
+ if ($editable)
+ {
+// echo
$GLOBALS['phpgw']->yuical->add_listener('billing_end_date', $billing_end_date);
+ echo
$GLOBALS['phpgw']->jqcal->add_listener('billing_end_date', 'date',
$billing_end_date);
+ }
+ else
+ {
+ echo
$billing_end_date;
+ }
+ ?>
+ </dd>
+ <dt>
<label for="reference"><?php
echo lang('reference') ?></label>
</dt>
<dd>
@@ -858,11 +888,14 @@
?>
<form
action="?menuaction=rental.uicontract.edit&id=<?php echo $contract->get_id()
?>" method="post">
<?php
- $notification_date = date('Y-m-d');
- if(isset($notification))
+ if(isset($notification))//Never??
{
- $notification_date =
date('Y-m-d',$notification->get_date());
+ $notification_date =
$GLOBALS['phpgw']->common->show_date($notification->get_date());
}
+ else
+ {
+ $notification_date =
$GLOBALS['phpgw']->common->show_date(time());
+ }
?>
@@ -872,8 +905,11 @@
<label
for="calendarNotificationDate"><?php echo lang('date') ?></label>
<!--<input
type="text" name="date_notification" id="date_notification" size="10"
value="<?php echo isset($notification) ?
htmlentities($notification->get_date()) : '' ?>" /> -->
- <?php echo
$GLOBALS['phpgw']->yuical->add_listener('date_notification',
$notification_date); ?>
- <?php echo
rental_uicommon::get_field_error($notification, 'date') ?>
+ <?php
+ // echo
$GLOBALS['phpgw']->yuical->add_listener('date_notification',
$notification_date);
+ echo
$GLOBALS['phpgw']->jqcal->add_listener('date_notification', 'date',
$notification_date);
+ echo
rental_uicommon::get_field_error($notification, 'date')
+ ?>
<label
for="notification_recurrence"><?php echo lang('recurrence') ?></label>
<select
name="notification_recurrence" id="notification_recurrence">
<option
<?php echo isset($notification) && $notification->get_recurrence() ==
rental_notification::RECURRENCE_NEVER ? 'selected="selected"' : ''
?>value="<?php echo rental_notification::RECURRENCE_NEVER ?>"><?php echo
lang('never') ?></option>
Modified:
branches/Version-1_0-branch/rental/templates/base/contract_list_partial.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/contract_list_partial.php
2014-09-09 11:11:24 UTC (rev 12086)
+++ branches/Version-1_0-branch/rental/templates/base/contract_list_partial.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -121,7 +121,7 @@
'index.php?menuaction=rental.uicontract.query&phpgw_return_as=json<?php
echo $url_add_on ?>&editable=<?php echo $editable ? "true" : "false"; ?>',
columnDefs,
'<?php echo $list_id ?>_form',
- ['<?php echo $list_id ?>_ctrl_toggle_contract_status','<?php
echo $list_id ?>_ctrl_toggle_contract_type','date_status'],
+ ['<?php echo $list_id ?>_ctrl_toggle_contract_status','<?php
echo $list_id ?>_ctrl_toggle_contract_type','date_status_hidden'],
'<?php echo $list_id ?>_container',
'<?php echo $list_id ?>_paginator',
'<?php echo $list_id ?>',
@@ -150,7 +150,7 @@
var startDate =
document.getElementById('start_date_report').value;
var endDate = document.getElementById('end_date_report').value;
- var dl = window.open('index.php?menuaction=rental.uicontract.download'+
+ var url = 'index.php?menuaction=rental.uicontract.download'+
'&type='+ctype+
'&contract_type='+typeoption+
'&contract_status='+statusoption+
@@ -158,9 +158,12 @@
'&query='+query+
'&search_option='+sOption+
//'&results=100'+
- '&date_start='+startDate+
- '&date_end='+endDate+
- '&export=true');
+ '&start_date_report='+startDate+
+ '&end_date_report='+endDate+
+ '&export=true';
+ // alert(url);
+
+ var dl = window.open(url);
}
function contract_export_price_items(ctype) {
@@ -260,9 +263,9 @@
<a href="javascript:contract_export('<?php echo
$list_id ?>');"><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/x-office-spreadsheet.png" alt="<?php echo
lang('export_contracts') ?>" title="<?php echo lang('export_contracts') ?>"
/></a>
<a href="javascript:contract_export_price_items('<?php
echo $list_id ?>');"><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/x-office-spreadsheet.png" alt="<?php echo
lang('export_contract_price_items') ?>" title="<?php echo
lang('export_contract_price_items') ?>" /></a>
<label class="toolbar_element_label"
for="start_date_report" id="label_start_date_report"><?php echo
lang('date_start') ?></label>
- <?php echo
$GLOBALS['phpgw']->yuical->add_listener('start_date_report',
$notification_date); ?>
+ <?php echo
$GLOBALS['phpgw']->yuical->add_listener('start_date_report',
$notification_date); ?>
<label class="toolbar_element_label"
for="end_date_report" id="label_end_date_report"><?php echo lang('date_end')
?></label>
- <?php echo
$GLOBALS['phpgw']->yuical->add_listener('end_date_report', $notification_date);
?>
+ <?php echo
$GLOBALS['phpgw']->yuical->add_listener('end_date_report',
$notification_date); ?>
</div>
</fieldset>
</form>
@@ -290,7 +293,7 @@
alert("tester1");
function date_event() {
alert("i date_event");
- var hidden_date = document.getElementById('date_status_hidden');
+ var hidden_date = document.getElementById('date_status');
if(hidden_date != undefined) {
var date = datestatus.value.split("/");
hidden_date.value = date[2]+"-"+date[1]+"-"+date[0];
Modified:
branches/Version-1_0-branch/rental/templates/base/contracts_for_regulation_list.php
===================================================================
---
branches/Version-1_0-branch/rental/templates/base/contracts_for_regulation_list.php
2014-09-09 11:11:24 UTC (rev 12086)
+++
branches/Version-1_0-branch/rental/templates/base/contracts_for_regulation_list.php
2014-09-09 14:02:27 UTC (rev 12087)
@@ -33,6 +33,9 @@
$adjustment_date = $adjustment->get_adjustment_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$adjustment->get_adjustment_date()) : '-';
echo $adjustment_date;
?>
+ <br/>
+ <label for="extra_adjustment"><?php echo
lang('extra_adjustment')?></label>
+ <input type="checkbox" name="extra_adjustment"
id="extra_adjustment"<?php echo $adjustment->is_extra_adjustment() ? '
checked="checked"' : '' ?> disabled="disabled"/>
<br/>
<?php if($adjustment->is_executed()){?>
<label for="is_executed"><?php echo
lang("adjustment_is_executed")?></label>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12087] Merge 12074:12086 from trunk,
Sigurd Nes <=