[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11069] Merge 11063:11068 from trunk
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [11069] Merge 11063:11068 from trunk |
Date: |
Tue, 23 Apr 2013 11:07:43 +0000 |
Revision: 11069
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11069
Author: sigurdne
Date: 2013-04-23 11:07:43 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
Merge 11063:11068 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
branches/Version-1_0-branch/property/inc/class.soXport.inc.php
branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
branches/Version-1_0-branch/property/js/yahoo/uitenant.edit.js
Added Paths:
-----------
branches/Version-1_0-branch/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
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
+
/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
Modified:
branches/Version-1_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
===================================================================
---
branches/Version-1_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2013-04-23 11:05:40 UTC (rev 11068)
+++
branches/Version-1_0-branch/bookingfrontend/inc/custom/default/Altinn2_Bergen_kommune.php
2013-04-23 11:07:43 UTC (rev 11069)
@@ -52,9 +52,16 @@
echo 'headers:<br>';
_debug_array($headers);
}
+/*
+ $headers['Osso-User-Dn'] =
'cn=02035701829,cn=users,dc=usrv,dc=ubergenkom,dc=no';// test
+// $fodsels_nr = substr($headers['Osso-User-Dn'],3, 11);
+*/
- $fodsels_nr = substr($headers['Osso-User-Dn'],2, 11);
- // $fodsels_nr = '02035701829'; // test
+ $header_regular_expression = '/^cn=(.*),cn=users.*$/';
+ $header_key = 'Osso-User-Dn';
+ $matches = array();
+
preg_match_all($header_regular_expression,$headers[$header_key], $matches);
+ $fodsels_nr = $matches[1][0];
if($this->debug)
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
2013-04-23 11:05:40 UTC (rev 11068)
+++ branches/Version-1_0-branch/phpgwapi/inc/auth/class.auth_custom_sso.inc.php
2013-04-23 11:07:43 UTC (rev 11069)
@@ -104,9 +104,16 @@
}
$headers = getallheaders();
- $fodsels_nr = substr($headers['Osso-User-Dn'],2, 11);
- $sql = "SELECT V_ORG_PERSON.BRUKERNAVN FROM
V_ORG_PERSON WHERE FODSELSNR ='{$fodsels_nr}'";
+// $headers['Osso-User-Dn'] =
'cn=02035701829,cn=users,dc=usrv,dc=ubergenkom,dc=no';// test
+
+ $header_regular_expression = '/^cn=(.*),cn=users.*$/';
+ $header_key = 'Osso-User-Dn';
+ $matches = array();
+
preg_match_all($header_regular_expression,$headers[$header_key], $matches);
+ $fodsels_nr = $matches[1][0];
+
+ $sql = "SELECT BRUKERNAVN FROM V_IDM_KOBLINGER WHERE
FODSELSNR ='{$fodsels_nr}'";
$db->query($sql,__LINE__,__FILE__);
$db->next_record();
return $db->f('BRUKERNAVN',true);
Modified: branches/Version-1_0-branch/property/inc/class.soXport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soXport.inc.php
2013-04-23 11:05:40 UTC (rev 11068)
+++ branches/Version-1_0-branch/property/inc/class.soXport.inc.php
2013-04-23 11:07:43 UTC (rev 11069)
@@ -720,8 +720,17 @@
{
$orders_affected = array();
$_dateformat = $this->db->date_format();
- $this->db->transaction_begin();
+ if ( $this->db->get_transaction() )
+ {
+ $this->global_lock = true;
+ }
+ else
+ {
+ $this->db->transaction_begin();
+ }
+
+
$this->add($values, $skip_update_voucher_id);
$voucher = $this->get_voucher($values[0]['bilagsnr']);
@@ -763,7 +772,13 @@
$this->delete_voucher_from_fm_ecobilag($values[0]['bilagsnr']);
$this->update_actual_cost_from_archive($orders_affected);
- return $this->db->transaction_commit();
+
+ if ( !$this->global_lock )
+ {
+ $this->db->transaction_commit();
+ }
+
+ return true;
}
Modified: branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2013-04-23 11:05:40 UTC (rev 11068)
+++ branches/Version-1_0-branch/property/inc/class.soadmin_entity.inc.php
2013-04-23 11:07:43 UTC (rev 11069)
@@ -450,17 +450,68 @@
'enable_bulk'
=> $this->db->f('enable_bulk'),
'jasperupload'
=> $this->db->f('jasperupload'),
'parent_id'
=> $this->db->f('parent_id'),
- 'level'
=> $this->db->f('level')
+ 'level'
=> $this->db->f('level'),
+ 'location_id'
=> $this->db->f('location_id')
+ );
+ }
+
+ return $category;
+ }
+
+ /**
+ * Get entity category based on location_id
+ * @param int $location_id the system location id
+ * @return array info about the entity category
+ */
+ function get_single_category($location_id)
+ {
+ $loc_arr =
$GLOBALS['phpgw']->locations->get_name($location_id);
+
+ $type_arr = explode('.', $loc_arr['location']);
+
+ if(!count($type_arr) == 3)
+ {
+ return array();
+ }
+
+ $type = $type_arr[1];
+
+ $sql = "SELECT * FROM fm_{$type}_category WHERE
location_id =" . (int)$location_id;
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ $category = array();
+ if ($this->db->next_record())
+ {
+ $category = array
+ (
+ 'id'
=> $this->db->f('id'),
+ 'name'
=> $this->db->f('name',true),
+ 'descr'
=> $this->db->f('descr',true),
+ 'prefix'
=> $this->db->f('prefix',true),
+ 'lookup_tenant'
=> $this->db->f('lookup_tenant'),
+ 'tracking'
=> $this->db->f('tracking'),
+ 'location_level'
=> $this->db->f('location_level'),
+ 'location_link_level' =>
$this->db->f('location_link_level'),
+ 'fileupload'
=> $this->db->f('fileupload'),
+ 'loc_link'
=> $this->db->f('loc_link'),
+ 'start_project'
=> $this->db->f('start_project'),
+ 'start_ticket'
=> $this->db->f('start_ticket'),
+ 'is_eav'
=> $this->db->f('is_eav'),
+ 'enable_bulk'
=> $this->db->f('enable_bulk'),
+ 'jasperupload'
=> $this->db->f('jasperupload'),
+ 'parent_id'
=> $this->db->f('parent_id'),
+ 'level'
=> $this->db->f('level'),
+ 'location_id'
=> $location_id
);
- $category['location_id'] =
$GLOBALS['phpgw']->locations->get_id($this->type_app[$this->type],
".{$this->type}.{$entity_id}.{$cat_id}");
}
-
return $category;
}
+
function read_category_name($entity_id,$cat_id)
{
$sql = "SELECT * FROM fm_{$this->type}_category WHERE
entity_id =" . (int)$entity_id . ' AND id = ' . (int)$cat_id;
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2013-04-23 11:05:40 UTC (rev 11068)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2013-04-23 11:07:43 UTC (rev 11069)
@@ -930,7 +930,7 @@
}
$this->db->query("SELECT DISTINCT fm_workorder.id AS
workorder_id, fm_workorder.title, fm_workorder.vendor_id,
fm_workorder.addition,"
- . " fm_workorder_status.descr as status,
fm_workorder_status.closed, fm_workorder.account_id AS b_account_id"
+ . " fm_workorder_status.descr as status,
fm_workorder_status.closed, fm_workorder.account_id AS b_account_id,
fm_workorder.charge_tenant"
. " FROM fm_workorder"
. " {$this->join} fm_workorder_status ON
fm_workorder.status = fm_workorder_status.id"
. " {$this->join} fm_workorder_budget ON
fm_workorder.id = fm_workorder_budget.order_id"
@@ -950,6 +950,7 @@
'closed'
=> !!$this->db->f('closed'),
'b_account_id' =>
$this->db->f('b_account_id'),
'addition_percentage' =>
(int)$this->db->f('addition'),
+ 'calculation' =>
$this->db->f('calculation'),
'combined_cost' => 0,
'budget'
=> 0,
'obligation' => 0,
Modified: branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-04-23 11:05:40 UTC (rev 11068)
+++ branches/Version-1_0-branch/property/inc/class.uiimport.inc.php
2013-04-23 11:07:43 UTC (rev 11069)
@@ -183,7 +183,7 @@
foreach ($this->messages as $message)
{
- echo '<li class="info">' .
$message . '</li>';
+ echo '<li class="info">Message:
' . $message . '</li>';
}
echo "</ul>";
}
Modified: branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
2013-04-23 11:05:40 UTC (rev 11068)
+++ branches/Version-1_0-branch/property/inc/class.uitenant_claim.inc.php
2013-04-23 11:07:43 UTC (rev 11069)
@@ -670,6 +670,8 @@
//_debug_array($values);
$project_values =
$this->boproject->read_single($values['project_id'], array(), true);
+
+ $project_values['workorder_budget'] =
$this->boproject->get_orders(array('project_id'=>
$values['project_id'],'year'=> 0));
$soinvoice = CreateObject('property.soinvoice');
@@ -683,9 +685,7 @@
else
{
$vouchers =
$soinvoice->read_invoice(array('workorder_id' => $workorder['workorder_id'],
'user_lid' => 'all'));
-
$workorder['voucher_id'] =
isset($vouchers[0]['voucher_id']) ? $vouchers[0]['voucher_id'] : '';
- $workorder['actual_cost'] =
isset($vouchers[0]['approved_amount']) ? $vouchers[0]['approved_amount'] : '';
}
}
@@ -797,10 +797,17 @@
if($project_values['workorder_budget'][$d]['selected']==1)
{
+
+
$project_values['workorder_budget'][$d]['budget_hidden'] =
$project_values['workorder_budget'][$d]['budget'];
+
$project_values['workorder_budget'][$d]['calculation_hidden'] =
$project_values['workorder_budget'][$d]['calculation'];
+
$project_values['workorder_budget'][$d]['actual_cost_hidden'] =
$project_values['workorder_budget'][$d]['actual_cost'];
$project_values['workorder_budget'][$d]['selected']='<input type="checkbox"
name="values[workorder][]" checked
value="'.$project_values['workorder_budget'][$d]['workorder_id'].'">';
}
else
{
+
$project_values['workorder_budget'][$d]['budget_hidden'] = 0;
+
$project_values['workorder_budget'][$d]['calculation_hidden'] = 0;
+
$project_values['workorder_budget'][$d]['actual_cost_hidden'] = 0;
$project_values['workorder_budget'][$d]['selected']='<input type="checkbox"
name="values[workorder][]"
value="'.$project_values['workorder_budget'][$d]['workorder_id'].'">';
}
}
@@ -823,11 +830,14 @@
(
'name' => "0",
'values' =>
json_encode(array( array('key' => 'workorder_id', 'label'=>'Workorder',
'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
-
array('key' => 'budget',
'label'=>'Budget', 'sortable'=>true,'resizeable'=>true),
-
array('key' => 'calculation',
'label'=>'Calculation', 'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'actual_cost','label'=>lang('actual cost'),'sortable'=>true,'resizeable'=>true),
+
array('key' => 'budget',
'label'=>'Budget',
'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
+
array('key' =>
'budget_hidden','hidden'=>true),
+
array('key' => 'calculation',
'label'=>'Calculation',
'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
+
array('key' =>
'calculation_hidden','hidden'=>true),
+
array('key' =>
'actual_cost','label'=>lang('actual
cost'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
+
array('key' =>
'actual_cost_hidden','hidden'=>true),
array('key' =>
'vendor_name','label'=>'Vendor','sortable'=>true,'resizeable'=>true),
-
array('key' =>
'charge_tenant','label'=>'Charge tenant','sortable'=>true,'resizeable'=>true),
+
array('key' =>
'charge_tenant','label'=>'Charge
tenant','sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterCenter'),
array('key' =>
'status','label'=>'Status','sortable'=>true,'resizeable'=>true),
array('key' =>
'voucher_id','label'=>lang('voucher'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'selected','label'=>'select', 'sortable'=>false,'resizeable'=>false)))
Copied:
branches/Version-1_0-branch/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
(from rev 11068,
trunk/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh)
===================================================================
---
branches/Version-1_0-branch/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
(rev 0)
+++
branches/Version-1_0-branch/property/inc/import/default/cvs_import_fiktiv_faktura_nlsh
2013-04-23 11:07:43 UTC (rev 11069)
@@ -0,0 +1,146 @@
+<?php
+ class import_conversion
+ {
+ protected $db;
+ public $messages = array();
+ public $warnings = array();
+ public $errors = array();
+ public $debug = true;
+ protected $period;
+ protected $date;
+
+ public function __construct()
+ {
+ set_time_limit(10000); //Set the time limit for this
request
+ $this->account =
(int)$GLOBALS['phpgw_info']['user']['account_id'];
+ $this->db = & $GLOBALS['phpgw']->db;
+ $this->join = $this->db->join;
+ $this->boinvoice =
CreateObject('property.boinvoice');
+ $this->soinvoice =
CreateObject('property.soinvoice');
+ $this->boworkorder =
CreateObject('property.boworkorder');
+
+ $this->config =
CreateObject('admin.soconfig',$GLOBALS['phpgw']->locations->get_id('property',
'.invoice'));
+
+
+ $file_info = pathinfo($_FILES['file']['name']);
+ $this->period = substr($file_info['filename'],-6);
+
+ if(!ctype_digit($this->period))
+ {
+ throw new Exception("Ikke en periode:
{$this->period}" );
+ }
+
+ $_year = substr($this->period,0,4);
+ $_month = substr($this->period,-2);
+ $_date = mktime(0, 0, 0, $_month, 15, $_year);
+
+ $this->date =
$GLOBALS['phpgw']->common->show_date($_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ }
+
+ public function add($data)
+ {
+
+/*
+ [0] => Hovedgruppering
+ [1] => Art
+ [2] => Hjelpetekst
+ [3] => Koststed
+ [4] => Beløp
+ [5] => Best.nr
+*/
+ $amount = str_replace(array('
',','),array('','.'),$data[4]);
+ $order_id = $data[5];
+ $error = false;
+
+ if(!$amount)
+ {
+ $this->warnings[] = "Linje mangler Beløp,
hopper over: {$data[0]}";
+ return true;
+ }
+ if(!$order_id)
+ {
+ $this->warnings[] = "Linje mangler
bestillingsnummer, hopper over: {$data[0]}";
+ return true;
+ }
+
+
if(!execMethod('property.soXport.check_order',$order_id))
+ {
+ $this->errors[] ="Ikke gyldig
bestillingsnummer: {$order_id}";
+ return false;
+ }
+
+
+// $_location_data =
execMethod('property.solocation.read_single', $location_code );
+
+ $workorder = $this->boworkorder->read_single($order_id);
+
+ $project =
execMethod('property.boproject.read_single_mini',$workorder['project_id']);
+
+ $values = array();
+
+ $values['order_id'] = $order_id;
+ $values['vendor_id'] = 99;
+ $values['invoice_id'] =
$this->boinvoice->get_auto_generated_invoice_num($values['vendor_id']);
+ $values['amount'] = $amount;
+
+ $order_info['janitor'] =
$GLOBALS['phpgw']->accounts->get($workorder['user_id'])->lid;
+ $supervisor_user_id =
$this->soinvoice->get_default_dimb_role_user(2, $project['ecodimb']);
+ if($supervisor_user_id)
+ {
+ $values['supervisor'] =
$GLOBALS['phpgw']->accounts->get($supervisor_user_id)->lid;
+ }
+
+ $budget_responsible_user_id =
$this->soinvoice->get_default_dimb_role_user(3, $project['ecodimb']);
+ if($budget_responsible_user_id)
+ {
+ $values['budget_responsible'] =
$GLOBALS['phpgw']->accounts->get($budget_responsible_user_id)->lid;
+ }
+
+ if(!$values['budget_responsible'])
+ {
+ $values['budget_responsible'] =
isset($this->config->config_data['import']['budget_responsible']) &&
$this->config->config_data['import']['budget_responsible'] ?
$this->config->config_data['import']['budget_responsible'] : 'karhal';
+ }
+
+ $values['project_group'] =
$project['project_group'];
+ $values['dimb'] =
$project['ecodimb'];
+
+ $location_arr = explode('-',
$workorder['location_code']);
+
+ $i = 1;
+ foreach ($location_arr as $_loc)
+ {
+ $values['location']["loc{$i}"] = $_loc;
+ $i++;
+ }
+
+
+ $values['invoice_date'] = $this->date;
+ $values['payment_date'] = $this->date;
+ $values['paid_date'] = $this->date;
+
+ $values['typeid'] = 5; //
administrasjon
+ $values['artid'] = 4; // fiktiv
+
+ $values['regtid'] =
date($GLOBALS['phpgw']->db->datetime_format());
+
+ $receipt =
$this->boinvoice->add_manual_invoice($values);
+
+ $ok = false;
+
+ if(!isset($receipt['error']) || !$receipt['error'])
+ {
+
+ $this->messages[] = "Importerer faktura med
beløp {$amount} til bestilling {$order_id}";
+ $ok = true;
+ }
+ else
+ {
+ $this->errors[] = "Noe feilet med bestilling
{$order_id}";
+ }
+
+
execMethod('property.soXport.update_actual_cost_from_archive',array($order_id
=> true));
+
+ return $ok;
+
+ }
+ }
Modified: branches/Version-1_0-branch/property/js/yahoo/uitenant.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/uitenant.edit.js
2013-04-23 11:05:40 UTC (rev 11068)
+++ branches/Version-1_0-branch/property/js/yahoo/uitenant.edit.js
2013-04-23 11:07:43 UTC (rev 11069)
@@ -13,15 +13,19 @@
this.addFooterDatatable = function(paginator,datatable)
{
//call getSumPerPage(name of column) in property.js
- tmp_sum1 = getSumPerPage('budget',2,paginator,datatable);
- tmp_sum2 = getSumPerPage('calculation',2,paginator,datatable);
+ tmp_sum1 = getSumPerPage('budget_hidden',0,paginator,datatable);
+ tmp_sum2 =
getSumPerPage('calculation_hidden',0,paginator,datatable);
+ tmp_sum3 =
getSumPerPage('actual_cost_hidden',0,paginator,datatable);
//Create ROW
newTR = document.createElement('tr');
td_sum('Sum');
td_sum(tmp_sum1);
+ td_empty(1);
td_sum(tmp_sum2);
- td_empty(7);
+ td_empty(1);
+ td_sum(tmp_sum3);
+ td_empty(6);
//Add to Table
myfoot = tableYUI.createTFoot();
@@ -37,6 +41,26 @@
addFooterDatatable(myPaginator_0,myDataTable_0);
}
/********************************************************************************/
+
+ var FormatterAmount0 = function(elCell, oRecord, oColumn, oData)
+ {
+ var amount = YAHOO.util.Number.format(oData, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
+ elCell.innerHTML = "<div align=\"right\">"+amount+"</div>";
+ }
+
+ var FormatterAmount2 = function(elCell, oRecord, oColumn, oData)
+ {
+ var amount = YAHOO.util.Number.format(oData, {decimalPlaces:2,
decimalSeparator:",", thousandsSeparator:" "});
+ elCell.innerHTML = "<div align=\"right\">"+amount+"</div>";
+ }
+
+ var FormatterCenter = function(elCell, oRecord, oColumn, oData)
+ {
+ elCell.innerHTML = "<center>"+oData+"</center>";
+ }
+
+
+
YAHOO.util.Event.addListener(window, "load", function()
{
loader = new YAHOO.util.YUILoader();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11069] Merge 11063:11068 from trunk,
Sigurd Nes <=