[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11623] Merge 11620:11622 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11623] Merge 11620:11622 from trunk |
|
Date: |
Thu, 23 Jan 2014 08:44:14 +0000 |
Revision: 11623
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11623
Author: sigurdne
Date: 2014-01-23 08:44:14 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
Merge 11620:11622 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
branches/Version-1_0-branch/property/templates/base/config.tpl
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964,8966,8968-8970,8972-8975,8977-8983,8985-8993,8995-9001,9003,9005,9007,9009,9011-9019,9021-9023,9025,9027-9028,9030-9044,9046-9047,9049-9050,9052-9056,9058-9059,9061,9063-9064,9066-9068,9071-9092,9094-9112,9114-9117,9119,9121-9160,9162-9166,9169-9207,9209-9211,9213-9215,9217,9219,9221-9253,9255,9257,9259-9260,9262,9264-9269,9271-9273,9275,9277-9278,9280,9282-9283,9285-9289,9291-9299,9301-9310,9312-9313,9315-9320,9322-9324,9326-9338,9340-9342,9344,9346-9348,9350-9358,9360-9362,9364-9366,9368-9374,9376-9382,9384,9386,9388-9390,9392-9396,9398-9402,9404-9410,9412,9414,9416-9417,9419-9425,9427,9429-9430,9432,9434-9463,9465-9502,9504-9506,9508-9521,9523-9526,9528,9530-9537,9539,9541-9551,9553,9555-9556,9558-9578,9580-9581,9583,9585,9587,9589,9591-9624,9626-9655,9657-9700,9702-9726,9728-9729,9731-9749,9751,9753-9754,9756-9832,9834-9836,9838-9839,9841-9846,9848-9850,9852-9858,9860-9863,9865,9867,9869-9871,9873-9893,9895,9897-9912,9914-9919,9921-9928,9930-9952,9954,9956,9958-9963,9965-9993,9995-9997,9999-10001,10003-10004,10006-10007,10009-10012,10014-10031,10033-10073,10075-10107,10109-10165,10167-10210,10222-10226,10228-10311,10313-10378,10380,10382,10384-10393,10395-10478,10480-10482,10484-10494,10496-10503,10505,10507,10509-10521,10523,10525-10528,10530-10540,10542-10543,10545-10568,10570-10584,10586-10590,10592-10594,10596,10598-10599,10601-10611,10613,10615,10617-10626,10628-10636,10638,10640-10654,10656-10658,10660,10662-10672,10674,10676-10682,10684,10686,10688-10690,10692-10694,10696-10697,10699-10701,10703,10705-10706,10708-10724,10726-10731,10734,10736-10748,10750-10796,10798-10939,10941,10943,10945,10947-10953,10955,10957-10961,10963,10965-10966,10968-11001,11003-11030,11032-11034,11036,11038,11040,11042-11053,11055-11059,11061-11062,11064-11068,11070-11073,11075-11077,11079-11083,11085,11087-11088,11090-11093,11095-11108,11110-11111,11113,11115-11116,11118-11120,11122,11124-11129,11131-11132,11134,11136,11138,11140-11151,11153-11161,11163-11185,11187-11189,11191-11229,11231,11233,11235-11264,11266-11267,11269-11278,11280-11282,11284-11291,11293-11295,11297,11299-11302,11304,11306,11309,11311,11313-11316,11318-11323,11325-11332,11334,11336-11344,11346,11348-11354,11356,11358-11360,11363-11386,11388-11389,11391-11392,11394,11396-11403,11405-11406,11408,11410,11412,11415,11417,11419-11420,11422,11424-11429,11431-11442,11444-11445,11447-11460,11462-11464,11466-11470,11472-11475,11477-11478,11480-11487,11489-11492,11494,11496,11498,11500-11502,11504-11506,11508,11510-11511,11513,11515,11517-11523,11525-11526,11528-11531,11533,11535-11538,11540-11546,11548-11560,11563-11572,11574,11576,11578,11580-11581,11583,11585,11587,11589-11592,11594-11595,11597,11599,11601,11603,11605-11607,11609-11611,11613,11615-11619
+
/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
Modified: branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
2014-01-23 08:41:32 UTC (rev 11622)
+++ branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
2014-01-23 08:44:14 UTC (rev 11623)
@@ -84,6 +84,7 @@
$allrows =
phpgw::get_var('allrows', 'bool');
$district_id =
phpgw::get_var('district_id', 'int');
$year =
phpgw::get_var('year', 'int');
+ $month =
phpgw::get_var('month', 'int');
$grouping =
phpgw::get_var('grouping', 'int');
$revision =
phpgw::get_var('revision', 'int');
$allrows =
phpgw::get_var('allrows', 'bool');
@@ -102,8 +103,8 @@
$this->sort = isset($sort)
&& $sort ? $sort : '';
$this->order = isset($order) &&
$order ? $order : '';
$this->cat_id = isset($cat_id) &&
$cat_id ? $cat_id : '';
- $this->dimb_id = isset($dimb_id) &&
$dimb_id ? $dimb_id :
$GLOBALS['phpgw_info']['user']['preferences']['property']['dimb'];
- $this->department =
isset($department) && $department ? $department :
$GLOBALS['phpgw_info']['user']['preferences']['property']['department'];
+ $this->dimb_id = isset($dimb_id) &&
$dimb_id ? $dimb_id :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['dimb'];
+ $this->department = isset($department) &&
$department ? $department :
'';//$GLOBALS['phpgw_info']['user']['preferences']['property']['department'];
$this->part_of_town_id = isset($part_of_town_id) &&
$part_of_town_id ? $part_of_town_id : '';
$this->district_id = isset($district_id)
&& $district_id ? $district_id : '';
@@ -111,6 +112,7 @@
$this->revision = isset($revision) &&
$revision ? $revision : 1;
$this->allrows = isset($allrows) &&
$allrows ? $allrows : '';
$this->year = isset($year)
&& $year ? $year : date('Y');
+ $this->month = isset($month) &&
$month ? $month : 0;
$this->details = $details;
if(isset($year) && !$this->year == $year &&
!$GLOBALS['phpgw_info']['menuaction']=='property.uibudget.obligations')
@@ -190,7 +192,7 @@
$obligations =
$this->so->read_obligations(array('start' => $this->start, 'query' =>
$this->query,
'sort' => strtoupper($this->sort), 'order' =>
$this->order, 'filter' => $this->filter,
'cat_id' => $this->cat_id,
'allrows'=>$this->allrows, 'district_id' => $this->district_id,
- 'year' => $this->year, 'grouping' =>
$this->grouping, 'revision' => $this->revision,
+ 'year' => $this->year,'month' => $this->month,
'grouping' => $this->grouping, 'revision' => $this->revision,
'details' => $this->details,'dimb_id' =>
$this->dimb_id, 'department' => $this->department,
'direction' => $this->direction));
Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2014-01-23 08:41:32 UTC (rev 11622)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2014-01-23 08:44:14 UTC (rev 11623)
@@ -518,7 +518,7 @@
function read_obligations($data)
{
- //_debug_array($data);
+// _debug_array($data);
$start = isset($data['start']) &&
$data['start'] ? $data['start'] : 0;
$filter = isset($data['filter']) ?
$data['filter'] : 'none';
$query = isset($data['query']) ?
$data['query'] : '';
@@ -526,10 +526,10 @@
$order = isset($data['order']) ?
$data['order'] : '';
$allrows = isset($data['allrows']) ?
$data['allrows'] : '';
$filter_district_id = isset($data['district_id'])
&& $data['district_id'] ? (int)$data['district_id'] : 0;
- $year = isset($data['year']) ?
(int)$data['year'] : '';
$grouping = isset($data['grouping']) ?
$data['grouping'] : '';
$revision = isset($data['revision']) ?
$data['revision'] : 1;
$year = isset($data['year']) &&
$data['year'] ? (int)$data['year'] : 0;
+ $month = isset($data['month']) &&
$data['month'] ? (int)$data['month'] : 0;
$cat_id = isset($data['cat_id']) ?
$data['cat_id'] : '';
$details = isset($data['details']) ?
$data['details'] : '';
$dimb_id = isset($data['dimb_id']) &&
$data['dimb_id'] ? (int)$data['dimb_id'] : 0;
@@ -541,6 +541,8 @@
return array();
}
+ $filter_period = $month ?
sprintf("%s%02d",$year,$month) : '';
+
$filtermethod_direction = '';
if($direction == 'income')
@@ -564,7 +566,7 @@
$filtermethod = '';
- $filtermethod_order = " WHERE (fm_workorder_budget.year
= $year OR fm_workorder_status.closed IS NULL)";
+ $filtermethod_order = " WHERE (fm_workorder_budget.year
= {$year} OR fm_workorder_status.closed IS NULL)";
$where = 'AND';
@@ -711,6 +713,11 @@
{
if($budget['year'] == $year)
{
+
+ if($budget['period'] !=
"{$year}00" && $filter_period && ((int)$filter_period+1) > $budget['period'])
+ {
+ continue;
+ }
/*
$projects3[$projects2[$order_id]]['actual_cost']+= $budget['actual_cost'];
$projects3[$projects2[$order_id]]['combined_cost']+= $budget['sum_orders'];
Modified: branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
2014-01-23 08:41:32 UTC (rev 11622)
+++ branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
2014-01-23 08:44:14 UTC (rev 11623)
@@ -75,6 +75,7 @@
$this->allrows = $this->bo->allrows;
$this->district_id = $this->bo->district_id;
$this->year = $this->bo->year;
+ $this->month = $this->bo->month;
$this->grouping = $this->bo->grouping;
$this->revision = $this->bo->revision;
$this->details = $this->bo->details;
@@ -96,7 +97,8 @@
'cat_id' =>
$this->cat_id,
'dimb_id' =>
$this->dimb_id,
'allrows' =>
$this->allrows,
- 'direction' =>
$this->direction
+ 'direction' =>
$this->direction,
+ 'month' => $this->month
);
$this->bo->save_sessiondata($data);
}
@@ -1029,6 +1031,7 @@
'district_id' =>
$this->district_id,
'grouping' =>
$this->grouping,
'year' =>
$this->year,
+ 'month' =>
$this->month,
'details' =>
$this->details,
'allrows' =>
$this->allrows,
'dimb_id' =>
$this->dimb_id,
@@ -1043,6 +1046,7 @@
."district_id:'{$this->district_id}',"
."grouping:'{$this->grouping}',"
."year:'{$this->year}',"
+ ."month:'{$this->month}',"
."details:'{$this->details}',"
."dimb_id:'{$this->dimb_id}',"
."direction:'{$this->direction}',"
@@ -1053,14 +1057,23 @@
$default_value = array
('id'=>'','name'=>lang('no year'));
array_unshift
($values_combo_box[0],$default_value);
- $values_combo_box[1] =
$this->bocommon->select_district_list('filter',$this->district_id);
+
+
+ for ($i=1;$i< 13 ;$i++)
+ {
+ $values_combo_box[1][] = array ('id'=>
$i,'name'=> sprintf("%02s",$i));
+ }
+
+ array_unshift ($values_combo_box[1], array
('id'=>'','name'=>lang('month')));
+
+ $values_combo_box[2] =
$this->bocommon->select_district_list('filter',$this->district_id);
$default_value = array
('id'=>'','name'=>lang('no district'));
- array_unshift
($values_combo_box[1],$default_value);
+ array_unshift
($values_combo_box[2],$default_value);
$cat_filter =
$this->cats->formatted_xslt_list(array('select_name' => 'cat_id','selected' =>
$this->cat_id,'globals' => True,'link_data' => $link_data));
foreach($cat_filter['cat_list'] as $_cat)
{
- $values_combo_box[2][] = array
+ $values_combo_box[3][] = array
(
'id' => $_cat['cat_id'],
'name' => $_cat['name'],
@@ -1068,27 +1081,27 @@
);
}
- array_unshift ($values_combo_box[2],array
('id'=>'', 'name'=>lang('no category')));
+ array_unshift ($values_combo_box[3],array
('id'=>'', 'name'=>lang('no category')));
//_debug_array($values_combo_box[2]);
- $values_combo_box[3] =
$this->bo->get_b_group_list($this->grouping);
+ $values_combo_box[4] =
$this->bo->get_b_group_list($this->grouping);
$default_value = array
('id'=>'','name'=>lang('no grouping'));
- array_unshift
($values_combo_box[3],$default_value);
+ array_unshift
($values_combo_box[4],$default_value);
- $values_combo_box[4] =
$this->bocommon->select_category_list(array('type'=>'department'));
- array_unshift ($values_combo_box[4], array
('id'=>'','name'=>lang('department')));
+ $values_combo_box[5] =
$this->bocommon->select_category_list(array('type'=>'department'));
+ array_unshift ($values_combo_box[5], array
('id'=>'','name'=>lang('department')));
- $values_combo_box[5] =
$this->bocommon->select_category_list(array('type'=>'dimb'));
- foreach($values_combo_box[5] as & $_dimb)
+ $values_combo_box[6] =
$this->bocommon->select_category_list(array('type'=>'dimb'));
+ foreach($values_combo_box[6] as & $_dimb)
{
$_dimb['name'] =
"{$_dimb['id']}-{$_dimb['name']}";
}
$default_value = array
('id'=>'','name'=>lang('no dimb'));
- array_unshift
($values_combo_box[5],$default_value);
+ array_unshift
($values_combo_box[6],$default_value);
- $values_combo_box[6] = array
+ $values_combo_box[7] = array
(
array
(
@@ -1128,13 +1141,22 @@
'tab_index' => 1
),
array
+ ( //boton
YEAR
+ 'id'
=> 'btn_month',
+ 'name'
=> 'month',
+ 'value'
=> lang('month'),
+ 'type'
=> 'button',
+ 'style'
=> 'filter',
+
'tab_index' => 2
+ ),
+ array
( //boton
DISTRICT
'id'
=> 'btn_district_id',
'name'
=> 'district_id',
'value'
=> lang('district_id'),
'type'
=> 'button',
'style'
=> 'filter',
-
'tab_index' => 2
+
'tab_index' => 3
),
/* array
( //boton
CATEGORY
@@ -1164,7 +1186,7 @@
'style'
=> 'filter',
'values' => $values_combo_box[2],
'onchange'=> 'onChangeSelect("cat_id");',
-
'tab_index' => 3
+
'tab_index' => 5
),
/*
array
@@ -1188,9 +1210,9 @@
'value'
=> lang('department'),
'type'
=> 'select',
'style'
=> 'filter',
-
'values' => $values_combo_box[4],
+
'values' => $values_combo_box[5],
'onchange'=> 'onChangeSelect("department");',
-
'tab_index' => 5
+
'tab_index' => 6
),
array
( //boton
USER
@@ -1200,9 +1222,9 @@
'value'
=> lang('dimb'),
'type'
=> 'select',
'style'
=> 'filter',
-
'values' => $values_combo_box[5],
+
'values' => $values_combo_box[6],
'onchange'=> 'onChangeSelect("dimb_id");',
-
'tab_index' => 6
+
'tab_index' => 7
),
array
( //boton
USER
@@ -1212,17 +1234,16 @@
'value'
=> lang('direction'),
'type'
=> 'select',
'style'
=> 'filter',
-
'values' => $values_combo_box[6],
+
'values' => $values_combo_box[7],
'onchange'=> 'onChangeSelect("direction");',
-
'tab_index' => 7
+
'tab_index' => 8
),
-
array
(
'type'
=> 'button',
'id'
=> 'btn_export',
'value'
=> lang('download'),
-
'tab_index' => 10
+
'tab_index' => 11
),
array
( //boton
SEARCH
@@ -1230,7 +1251,7 @@
'name'
=> 'search',
'value'
=> lang('search'),
'type'
=> 'button',
-
'tab_index' => 9
+
'tab_index' => 10
),
array
( // TEXT IMPUT
@@ -1240,7 +1261,7 @@
'type'
=> 'text',
'size'
=> 28,
'onkeypress'=> 'return pulsar(event)',
-
'tab_index' => 8
+
'tab_index' => 9
)
),
'hidden_value' => array
@@ -1256,16 +1277,14 @@
'value'
=> $this->bocommon->select2String($values_combo_box[1])
),
array
+ ( //div values
combo_box_2
+ 'id' =>
'values_combo_box_2',
+ 'value'
=> $this->bocommon->select2String($values_combo_box[2])
+ ),
array
( //div values
combo_box_3
- 'id' =>
'values_combo_box_2',
+ 'id' =>
'values_combo_box_3',
'value'
=> $this->bocommon->select2String($values_combo_box[3])
- ),/*
- array
- ( //div values
combo_box_4
- 'id' =>
'values_combo_box_4',
- 'value'
=> $this->bocommon->select2String($values_combo_box[4])
- )*/
-
+ )
)
)
)
Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2014-01-23 08:41:32 UTC (rev 11622)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
2014-01-23 08:44:14 UTC (rev 11623)
@@ -1423,9 +1423,10 @@
$last_day_of_year = mktime (13 , 0, 0 ,12, 31,
date("Y"));
+
if( $project['end_date'] &&
!$values['end_date'])
{
-
if($project['project_type_id']==1)//operation
+ if($project['project_type_id']==1 &&
isset($config->config_data['delay_operation_workorder_end_date']) &&
$config->config_data['delay_operation_workorder_end_date']==1)//operation
{
$values['end_date'] =
$GLOBALS['phpgw']->common->show_date($last_day_of_year,
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
@@ -1436,8 +1437,7 @@
}
else if( !$project['end_date'] &&
!$values['end_date'])
{
-
-
if($project['project_type_id']==1)//operation
+ if($project['project_type_id']==1 &&
isset($config->config_data['delay_operation_workorder_end_date']) &&
$config->config_data['delay_operation_workorder_end_date']==1)//operation
{
$values['end_date'] =
$GLOBALS['phpgw']->common->show_date($last_day_of_year,
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
Modified: branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
2014-01-23 08:41:32 UTC (rev 11622)
+++ branches/Version-1_0-branch/property/js/yahoo/budget.obligations.js
2014-01-23 08:44:14 UTC (rev 11623)
@@ -3,12 +3,12 @@
//--------------------------------------------------------
//define SelectButton
- var oMenuButton_0, oMenuButton_1, oMenuButton_2;//,
oMenuButton_3, oMenuButton_4;
+ var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3;
var selectsButtons = [
{order:0, var_URL:'year', name:'btn_year',
style:'',dependiente:[]},
- {order:1, var_URL:'district_id',name:'btn_district_id',
style:'',dependiente:[]},
- {order:2, var_URL:'grouping', name:'btn_grouping',
style:'',dependiente:[]}
-// {order:4, var_URL:'dimb_id', name:'btn_dimb_id',
style:'',dependiente:[]}
+ {order:1, var_URL:'month', name:'btn_month',
style:'',dependiente:[]},
+ {order:2, var_URL:'district_id',name:'btn_district_id',
style:'',dependiente:[]},
+ {order:3, var_URL:'grouping', name:'btn_grouping',
style:'',dependiente:[]}
]
// define buttons
@@ -53,30 +53,33 @@
execute_ds();
}
- this.filter_grouping = function(year,district_id,param,details)
+ this.filter_grouping =
function(year,month,district_id,param,details)
{
if(details)
{
//look for "grouping" column
- oMenuButton_2.set("label", ("<em>" + param +
"</em>"));
- oMenuButton_2.set("value", param);
+ oMenuButton_3.set("label", ("<em>" + param +
"</em>"));
+ oMenuButton_3.set("value", param);
path_values.grouping = param;
}
else
{
//reset GROUPING filter
- oMenuButton_2.set("label", ("<em>" +
array_options[2][0][1] + "</em>"));
- path_values.grouping = array_options[2][0][0];
+ oMenuButton_3.set("label", ("<em>" +
array_options[3][0][1] + "</em>"));
+ path_values.grouping = array_options[3][0][0];
path_values.b_account = param;
}
oMenuButton_0.set("label", ("<em>" + year + "</em>"));
path_values.year= year;
+
+ oMenuButton_1.set("label", ("<em>" + month + "</em>"));
+ path_values.month= month;
//look for REVISION filter 's text using COD
index = locate_in_array_options(1,"value",district_id);
- oMenuButton_1.set("label", ("<em>" +
array_options[1][index][1] + "</em>"));
- oMenuButton_1.set("value", array_options[1][index][0]);
+ oMenuButton_2.set("label", ("<em>" +
array_options[2][index][1] + "</em>"));
+ oMenuButton_2.set("value", array_options[2][index][0]);
path_values.district_id = district_id;
path_values.details = details;
@@ -104,7 +107,7 @@
district_id = oRecord._oData.district_id;
}
- elCell.innerHTML = "<a
onclick=\"javascript:filter_grouping("+path_values.year+","+district_id+","+
text +","+details+");\" href=\"#\">" + text + "</a>";
+ elCell.innerHTML = "<a
onclick=\"javascript:filter_grouping("+path_values.year+","+path_values.month+","+district_id+","+
text +","+details+");\" href=\"#\">" + text + "</a>";
}
/********************************************************************************/
var myFormatLink_Count = function(elCell, oRecord, oColumn,
oData)
Modified: branches/Version-1_0-branch/property/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/config.tpl
2014-01-23 08:41:32 UTC (rev 11622)
+++ branches/Version-1_0-branch/property/templates/base/config.tpl
2014-01-23 08:44:14 UTC (rev 11623)
@@ -157,6 +157,17 @@
</select>
</td>
</tr>
+ <tr class="row_on">
+ <td>{lang_delay_operation_workorder_end_date},
{lang_last_day_in_year}:</td>
+ <td>
+ <select
name="newsettings[delay_operation_workorder_end_date]">
+ <option value=""
{selected_delay_operation_workorder_end_date_}>NO</option>
+ <option value="1"
{selected_delay_operation_workorder_end_date_1}>YES</option>
+ </select>
+ </td>
+ </tr>
+
+
<tr class="row_off">
<td>{lang_Default_municipal_number}:</td>
<td><input name="newsettings[default_municipal]"
value="{value_default_municipal}"></td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11623] Merge 11620:11622 from trunk,
Sigurd Nes <=