[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9029] Merge 9026:9028 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9029] Merge 9026:9028 from trunk |
|
Date: |
Thu, 22 Mar 2012 14:27:06 +0000 |
Revision: 9029
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9029
Author: sigurdne
Date: 2012-03-22 14:27:06 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Merge 9026:9028 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.soproject.inc.php
branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
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
+
/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
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-03-22 14:25:47 UTC (rev 9028)
+++ branches/Version-1_0-branch/activitycalendarfrontend/setup/phpgw_no.lang
2012-03-22 14:27:06 UTC (rev 9029)
@@ -94,4 +94,4 @@
address activitycalendarfrontend no Adresse
activity_edit_helptext_step1 activitycalendarfrontend no Skal du
endre opplysninger knyttet til en aktivitet må du være registrert som
kontaktperson for organisasjonen.<br/>Du velger organisasjon og aktivitet i
bildet under, og får en e-post i retur med en lenke til endringsskjema.
mail_body_update_frontend activitycalendarfrontend no Dette
er en melding fra Bergen kommune/AktivBy.<br/><br/>I aktivitetsoversikten som
ligger i kommuneportalen på internett, står du registrert som kontaktperson for
%1.<br/>Det har kommet inn et endringsønske på denne aktiviteten. Bruk lenken
under for å endre opplysningene om aktiviteten.<br/>%2<br/><br/><br/> Mvh %3
kulturkontor
-mail_subject_update activitycalendar no Melding fra AktivBy -
Aktivitetsoversikt
\ No newline at end of file
+mail_subject_update activitycalendarfrontend no Melding fra
AktivBy - Aktivitetsoversikt
\ No newline at end of file
Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2012-03-22 14:25:47 UTC (rev 9028)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2012-03-22 14:27:06 UTC (rev 9029)
@@ -803,6 +803,7 @@
$_taxcode[$this->db->f('id')] =
$this->db->f('percent');
}
+//-------start check paid-----------
$sql = "SELECT fm_b_account.{$b_account_field} as
{$b_account_field}, district_id, sum(godkjentbelop) as actual_cost,dimb,mvakode"
. " FROM fm_ecobilagoverf"
. " {$this->join} fm_b_account ON
fm_ecobilagoverf.spbudact_code =fm_b_account.id"
@@ -826,6 +827,34 @@
$ecodimb[(int)$this->db->f('dimb')] = true;
}
+//-------end check paid-----------
+
+//-------start check active invoices-----------
+ $sql = "SELECT fm_b_account.{$b_account_field} as
{$b_account_field}, district_id, sum(godkjentbelop) as actual_cost,dimb,mvakode"
+ . " FROM fm_ecobilag"
+ . " {$this->join} fm_b_account ON
fm_ecobilag.spbudact_code =fm_b_account.id"
+ . " {$this->join} fm_location1 ON
fm_ecobilag.loc1 = fm_location1.loc1"
+ . " {$this->join} fm_part_of_town ON
fm_location1.part_of_town_id = fm_part_of_town.part_of_town_id"
+ . " {$this->join} fm_workorder ON
fm_ecobilag.pmwrkord_code = fm_workorder.id"
+ . " {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id"
+ . " WHERE (periode >= 0 AND periode <=
$end_periode OR periode IS NULL) {$filtermethod}"
+ . " GROUP BY fm_b_account.{$b_account_field},
district_id, dimb, mvakode";
+
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $_taxfactor = 1 +
($_taxcode[(int)$this->db->f('mvakode')]/100);
+ $_actual_cost =
round($this->db->f('actual_cost')/$_taxfactor);
+ $sum_actual_cost += $_actual_cost;
+
$actual_cost[$this->db->f($b_account_field)][(int)$this->db->f('district_id')][(int)$this->db->f('dimb')]
+= $_actual_cost;
+ $accout_info[$this->db->f($b_account_field)] =
true;
+ $district[(int)$this->db->f('district_id')] =
true;
+ $ecodimb[(int)$this->db->f('dimb')] = true;
+ }
+
+//-------end check active invoices-----------
+
// start service agreements
$filtermethod = " fm_s_agreement_budget.year = $year";
@@ -849,8 +878,6 @@
$where = 'AND';
}
-
-
$sql = "SELECT sum(budget) as budget,
count(fm_s_agreement.id) as hits, fm_b_account.{$b_account_field} as
{$b_account_field}, fm_s_agreement_budget.ecodimb"
. " FROM fm_s_agreement"
. " {$this->join} fm_s_agreement_budget ON
fm_s_agreement.id = fm_s_agreement_budget.agreement_id"
@@ -876,6 +903,7 @@
}
+//-------start check paid-----------
$sql = "SELECT fm_b_account.{$b_account_field} as
{$b_account_field}, sum(fm_ecobilagoverf.godkjentbelop) as
actual_cost,fm_s_agreement_budget.ecodimb"
. " FROM fm_ecobilagoverf"
@@ -901,7 +929,59 @@
$ecodimb[(int)$this->db->f('dimb')] = true;
}
+//-------end check paid-----------
+//-------start check active invoices-----------
+
+ $filtermethod = '';
+ $where = 'WHERE';
+
+ if ($cat_id > 0)
+ {
+ $filtermethod .= " $where
fm_s_agreement.category = " . (int)$cat_id;
+ $where = 'AND';
+ }
+
+ if ($grouping > 0)
+ {
+ $filtermethod .= " $where
fm_b_account.category='$grouping' ";
+ $where = 'AND';
+ }
+
+ if ($dimb_id > 0)
+ {
+ $filtermethod .= " $where
fm_s_agreement_budget.ecodimb={$dimb_id}";
+ $where = 'AND';
+ }
+
+
+
+ $sql = "SELECT fm_b_account.{$b_account_field} as
{$b_account_field}, sum(fm_ecobilag.godkjentbelop) as
actual_cost,fm_s_agreement_budget.ecodimb"
+ . " FROM fm_ecobilag"
+ . " {$this->join} fm_b_account ON
fm_ecobilag.spbudact_code =fm_b_account.id"
+ . " {$this->join} fm_s_agreement ON
fm_ecobilag.pmwrkord_code = fm_s_agreement.id"
+ . " {$this->join} fm_s_agreement_budget ON
fm_s_agreement.id = fm_s_agreement_budget.agreement_id"
+ . " {$filtermethod}"
+ . " GROUP BY fm_b_account.{$b_account_field},
ecodimb";
+//_debug_array($sql);
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $_actual_cost =
round($this->db->f('actual_cost'));
+ $_account_value =
$this->db->f($b_account_field);
+ $_dimb = (int)$this->db->f('ecodimb');
+
+ $sum_actual_cost += $_actual_cost;
+
$actual_cost[$_account_value][$_dummy_district][$_dimb] += $_actual_cost;
+
$obligations[$_account_value][$_dummy_district][$_dimb] -= $_actual_cost;
+ $accout_info[$_account_value] = true;
+ $district[$_dummy_district] = true;
+ $ecodimb[(int)$this->db->f('dimb')] = true;
+ }
+
+
+//-------end check active invoices-----------
// end service agreements
$this->sum_budget_cost = $sum_budget_cost;
$this->sum_obligation_cost = $sum_obligation_cost;
Modified: branches/Version-1_0-branch/property/inc/class.soproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-03-22 14:25:47 UTC (rev 9028)
+++ branches/Version-1_0-branch/property/inc/class.soproject.inc.php
2012-03-22 14:27:06 UTC (rev 9029)
@@ -706,13 +706,26 @@
}
$project['combined_cost'] +=
($_sum - $__actual_cost);
- if($project['combined_cost'] < 0)
- {
- $project['combined_cost'] = 0;
- }
$project['actual_cost'] +=
$_actual_cost;
$project['billable_hours'] +=
(int)$this->db->f('billable_hours');
}
+
+ $sql_workder = 'SELECT godkjentbelop AS
actual_cost'
+ . " FROM fm_ecobilag {$this->join} fm_workorder
ON fm_ecobilag.pmwrkord_code = fm_workorder.id"
+ . " WHERE fm_workorder.project_id =
'{$project['project_id']}'";
+
+ $this->db->query($sql_workder);
+ while ($this->db->next_record())
+ {
+ $_actual_cost =
(int)$this->db->f('actual_cost');
+ $project['combined_cost'] +=
($_sum - $_actual_cost);
+ $project['actual_cost'] +=
$_actual_cost;
+ }
+
+ if($project['combined_cost'] < 0)
+ {
+ $project['combined_cost'] = 0;
+ }
}
$_datatype = array();
@@ -1513,6 +1526,15 @@
$year = substr(
$this->db->f('periode'), 0, 4 );
$cost_info[$year]['actual_cost'] +=
$this->db->f('actual_cost');
}
+
+ $sql = "SELECT sum(godkjentbelop) AS
actual_cost, periode FROM fm_ecobilag WHERE pmwrkord_code = '{$order}' GROUP BY
periode ORDER BY periode ASC ";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ $year = substr(
$this->db->f('periode'), 0, 4 );
+ $cost_info[$year]['actual_cost'] +=
$this->db->f('actual_cost');
+ }
+
}
$config = CreateObject('phpgwapi.config','property');
@@ -1566,6 +1588,13 @@
{
$cost_info[$year]['sum_orders'] -=
$this->db->f('amount');
}
+
+ $sql = "SELECT godkjentbelop as amount FROM
fm_ecobilag WHERE pmwrkord_code = '{$order['order_id']}'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ $cost_info[$year]['sum_orders'] -=
$this->db->f('amount');
+ }
}
$sort_year = array();
Modified: branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-03-22 14:25:47 UTC (rev 9028)
+++ branches/Version-1_0-branch/property/inc/class.soworkorder.inc.php
2012-03-22 14:27:06 UTC (rev 9029)
@@ -687,6 +687,22 @@
$workorder['loc' . ($m+1)] =
$location[$m];
$workorder['query_location']['loc' .
($m+1)]=implode("-", array_slice($location, 0, ($m+1)));
}
+
+ $sql_workder = 'SELECT godkjentbelop AS
actual_cost'
+ . " FROM fm_ecobilag WHERE pmwrkord_code =
'{$workorder['workorder_id']}'";
+
+ $this->db->query($sql_workder);
+ while ($this->db->next_record())
+ {
+ $_actual_cost =
(int)$this->db->f('actual_cost');
+ $workorder['combined_cost'] -=
$_actual_cost;
+ $workorder['actual_cost'] +=
$_actual_cost;
+ }
+
+ if($workorder['combined_cost'] < 0)
+ {
+ $workorder['combined_cost'] = 0;
+ }
}
return $workorder_list;
@@ -1087,8 +1103,19 @@
$old_billable_hours =
$this->db->f('billable_hours');
$old_approved = $this->db->f('approved');
- if ($this->db->f('calculation') > 0)
+ if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['currency']))
{
+ $workorder['contract_sum'] =
str_ireplace($GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],'',$workorder['contract_sum']);
+ }
+
+ $workorder['contract_sum'] =
str_replace(array(' ',','),array('','.'),$workorder['contract_sum']);
+
+ if ( abs((int)$workorder['contract_sum']) > 0)
+ {
+ $combined_cost =
(int)$workorder['contract_sum'];
+ }
+ else if ($this->db->f('calculation') > 0)
+ {
$calculation = $this->db->f('calculation');
$config =
CreateObject('phpgwapi.config','property');
$config->read_repository();
@@ -1115,13 +1142,6 @@
$paid = 2;
}
- if
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['currency']))
- {
- $workorder['contract_sum'] =
str_ireplace($GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],'',$workorder['contract_sum']);
- }
- $workorder['contract_sum'] =
str_replace(array(' ',','),array('','.'),$workorder['contract_sum']);
-
-
$value_set = array
(
'title' =>
$workorder['title'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9029] Merge 9026:9028 from trunk,
Sigurd Nes <=