[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8738] Merge 8731:8737 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8738] Merge 8731:8737 from trunk |
|
Date: |
Tue, 31 Jan 2012 10:13:47 +0000 |
Revision: 8738
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8738
Author: sigurdne
Date: 2012-01-31 10:13:46 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------
Merge 8731:8737 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
branches/Version-1_0-branch/controller/inc/class.menu.inc.php
branches/Version-1_0-branch/controller/inc/hook_home.inc.php
branches/Version-1_0-branch/controller/setup/setup.inc.php
branches/Version-1_0-branch/controller/templates/base/config.tpl
branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/controller/inc/hook_settings.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
+
/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
Modified:
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
---
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-01-31 10:11:17 UTC (rev 8737)
+++
branches/Version-1_0-branch/activitycalendarfrontend/inc/class.uiactivity.inc.php
2012-01-31 10:13:46 UTC (rev 8738)
@@ -215,8 +215,9 @@
$persons[] = $p;
}
$desc =
phpgw::get_var('group_description');
- $group =
$this->so_group>get_group_local($g_id);
+ $group =
$this->so_group->get_group_local($g_id);
$person_ids =
$this->so_group->get_contacts_local($g_id);
+ $organization =
$this->so_organization->get_single($o_id);
}
else if(isset($g_id) &&
is_numeric($g_id) && $g_id > 0)
{
@@ -770,6 +771,72 @@
}
}
+ function edit_group_values()
+ {
+ $group_id = phpgw::get_var('group_id');
+ if(isset($group_id))
+ {
+ if(isset($_POST['save_group'])) //save updated
organization info
+ {
+ $group =
$this->so_group->get_single($group_id);
+
+ $group_info['name'] =
phpgw::get_var('groupname');
+ $group_info['organization_id'] =
phpgw::get_var('orgid');
+ $group_info['description'] =
phpgw::get_var('org_description');
+ $group_info['status'] = "change";
+ $group_info['original_group_id'] =
$group_id;
+ $g_id =
$this->so_activity->add_group_local($group_info);
+
+ //add contact persons
+ $contact1 = array();
+ $contact1['name'] =
phpgw::get_var('group_contact1_name');
+ $contact1['phone'] =
phpgw::get_var('group_contact1_phone');
+ $contact1['mail'] =
phpgw::get_var('group_contact1_email');
+ $contact1['org_id'] = 0;
+ $contact1['group_id'] = $g_id;
+
$this->so_activity->add_contact_person_local($contact1);
+
+ $contact2 = array();
+ $contact2['name'] =
phpgw::get_var('group_contact2_name');
+ $contact2['phone'] =
phpgw::get_var('group_contact2_phone');
+ $contact2['mail'] =
phpgw::get_var('group_contact2_email');
+ $contact2['org_id'] = 0;
+ $contact2['group_id'] = $g_id;
+
$this->so_activity->add_contact_person_local($contact2);
+
+ $message = lang('change_request_ok',
$group_info['name']);
+
+ $this->render('group_reciept.php', array
+ (
+ 'message' =>
isset($message) ? $message : phpgw::get_var('message'),
+ 'error' =>
isset($error) ? $error : phpgw::get_var('error')
+ )
+ );
+
+ }
+ else
+ {
+ $group =
$this->so_group->get_single($group_id);
+ $person_arr =
$this->so_contact->get(null, null, null, null, null, null, array('group_id' =>
$group_id));
+ foreach($person_arr as $p)
+ {
+ $persons[] = $p;
+ }
+
+ $this->render('group_edit.php', array
+ (
+ 'group' => $group,
+ 'contact1' =>
$persons[0],
+ 'contact2' =>
$persons[1],
+ 'editable' => true,
+ 'message' =>
isset($message) ? $message : phpgw::get_var('message'),
+ 'error' =>
isset($error) ? $error : phpgw::get_var('error')
+ )
+ );
+ }
+ }
+ }
+
public function get_organization_activities()
{
$GLOBALS['phpgw_info']['flags']['noheader'] = true;
Modified: branches/Version-1_0-branch/controller/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/class.menu.inc.php
2012-01-31 10:11:17 UTC (rev 8737)
+++ branches/Version-1_0-branch/controller/inc/class.menu.inc.php
2012-01-31 10:13:46 UTC (rev 8738)
@@ -164,6 +164,11 @@
'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilocation.responsiblility_role', 'menu_selection' =>
'admin::controller::role_at_location') ),
'text' => lang('role at
location'),
'image' => array('property',
'responsibility_role')
+ ),
+ 'controller_document_types' => array
+ (
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'controller.uidocument.document_types', 'menu_selection' =>
'admin::controller::controller_document_types') ),
+ 'text' => lang('Document
types')
)
);
}
@@ -173,13 +178,13 @@
$menus['preferences'] = array
(
// in case of userprefs - need a hook
for 'settings'
-/*
+
array
(
'text' =>
$GLOBALS['phpgw']->translation->translate('Preferences', array(), true),
'url' =>
$GLOBALS['phpgw']->link('/preferences/preferences.php', array('appname' =>
'controller', 'type'=> 'user') )
),
-*/
+
array
(
'text' =>
$GLOBALS['phpgw']->translation->translate('Grant Access', array(), true),
Modified: branches/Version-1_0-branch/controller/inc/hook_home.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-01-31 10:11:17 UTC (rev 8737)
+++ branches/Version-1_0-branch/controller/inc/hook_home.inc.php
2012-01-31 10:13:46 UTC (rev 8738)
@@ -36,6 +36,11 @@
$so = CreateObject('controller.socheck_list');
$so_control = CreateObject('controller.socontrol');
+
+ $config = CreateObject('phpgwapi.config','controller');
+ $config->read();
+ $limit_no_of_planned =
isset($GLOBALS['phpgw_info']['user']['preferences']['controller']['no_of_planned_controls'])?
$GLOBALS['phpgw_info']['user']['preferences']['controller']['no_of_planned_controls']
: (isset($config->config_data['no_of_planned_controls']) &&
$config->config_data['no_of_planned_controls'] > 0 ?
$config->config_data['no_of_planned_controls']:5);
+ $limit_no_of_assigned =
isset($GLOBALS['phpgw_info']['user']['preferences']['controller']['no_of_assigned_controls'])?
$GLOBALS['phpgw_info']['user']['preferences']['controller']['no_of_assigned_controls']
: (isset($config->config_data['no_of_assigned_controls']) &&
$config->config_data['no_of_assigned_controls'] > 0 ?
$config->config_data['no_of_assigned_controls']:10);
//echo '<H1> Hook for controller </H1>';
//$location_code = '1101';
@@ -147,12 +152,18 @@
}
//sort data by planned date for check list
sort($portalbox1_data);
+ //$limit = 5;
+ $tmp = 0;
foreach($portalbox1_data as $check_list_dates)
{
- $portalbox1->data[] = $check_list_dates[1];
+ if($tmp < $limit_no_of_planned)
+ {
+ $portalbox1->data[] = $check_list_dates[1];
+ }
+ $tmp++;
}
echo "\n".'<!-- BEGIN checklist info
-->'."\n".$portalbox1->draw()."\n".'<!-- END checklist info -->'."\n";
-
+
$portalbox2 = CreateObject('phpgwapi.listbox', array
(
'title' => "Mine tildelte kontroller",
@@ -180,7 +191,7 @@
foreach ( $var as $key => $value )
{
- // $portalbox->set_controls($key,$value);
+// $portalbox2->set_controls($key,$value);
}
$category_name = array(); // caching
@@ -241,8 +252,14 @@
}
//sort data by due date for check list
sort($portalbox2_data);
+ //$limit = 20;
+ $tmp = 0;
foreach($portalbox2_data as $check_list_dates)
{
- $portalbox2->data[] = $check_list_dates[1];
+ if($tmp < $limit_no_of_assigned)
+ {
+ $portalbox2->data[] = $check_list_dates[1];
+ }
+ $tmp++;
}
echo "\n".'<!-- BEGIN assigned checklist info
-->'."\n".$portalbox2->draw()."\n".'<!-- END assigned checklist info -->'."\n";
Copied: branches/Version-1_0-branch/controller/inc/hook_settings.inc.php (from
rev 8737, trunk/controller/inc/hook_settings.inc.php)
===================================================================
--- branches/Version-1_0-branch/controller/inc/hook_settings.inc.php
(rev 0)
+++ branches/Version-1_0-branch/controller/inc/hook_settings.inc.php
2012-01-31 10:13:46 UTC (rev 8738)
@@ -0,0 +1,35 @@
+<?php
+ /**
+ * phpGroupWare - controller: a part of a Facilities Management System.
+ *
+ * @author Erik Holm-Larsen <address@hidden>
+ * @author Torstein Vadla <address@hidden>
+ * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/
+ * @package property
+ * @subpackage controller
+ * @version $Id:$
+ */
+
+
+
+ create_input_box('Number of planned controls on home
page','no_of_planned_controls', '');
+ create_input_box('Number of assigned controls on home
page','no_of_assigned_controls', '');
+
\ No newline at end of file
Modified: branches/Version-1_0-branch/controller/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/controller/setup/setup.inc.php 2012-01-31
10:11:17 UTC (rev 8737)
+++ branches/Version-1_0-branch/controller/setup/setup.inc.php 2012-01-31
10:13:46 UTC (rev 8738)
@@ -30,6 +30,7 @@
'menu' => 'controller.menu.get_menu',
'config',
'home',
+ 'settings',
'cat_add' => 'controller.cat_hooks.cat_add',
'cat_delete' => 'controller.cat_hooks.cat_delete',
'cat_edit' => 'controller.cat_hooks.cat_edit'
Modified: branches/Version-1_0-branch/controller/templates/base/config.tpl
===================================================================
--- branches/Version-1_0-branch/controller/templates/base/config.tpl
2012-01-31 10:11:17 UTC (rev 8737)
+++ branches/Version-1_0-branch/controller/templates/base/config.tpl
2012-01-31 10:13:46 UTC (rev 8738)
@@ -22,6 +22,18 @@
</select>
</td>
</tr>
+ <tr class="row_on">
+ <td>Antall planlagte kontroller som skal vises.</td>
+ <td>
+ <input type="text"
name="newsettings[no_of_planned_controls]"
value="{value_no_of_planned_controls}"/>
+ </td>
+ </tr>
+ <tr class="row_off">
+ <td>Antall tildelte kontroller som skal vises</td>
+ <td>
+ <input type="text"
name="newsettings[no_of_assigned_controls]"
value="{value_no_of_assigned_controls}"/>
+ </td>
+ </tr>
<!-- END body -->
<!-- BEGIN footer -->
<tr class="th">
Modified: branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-01-31 10:11:17 UTC (rev 8737)
+++ branches/Version-1_0-branch/property/inc/class.soinvoice.inc.php
2012-01-31 10:13:46 UTC (rev 8738)
@@ -354,15 +354,17 @@
$table ='fm_ecobilag';
}
-
- if ($order)
+ switch($order)
{
- $ordermethod = " order by $order $sort";
+ case 'dima':
+ case 'belop':
+ case 'spbudact_code':
+ case 'pmwrkord_code':
+ $ordermethod = " ORDER BY $order $sort";
+ break;
+ default:
+ $ordermethod = ' ORDER BY pmwrkord_code
DESC, id DESC';
}
- else
- {
- $ordermethod = ' order by id DESC';
- }
$filtermethod = '';
$where = 'WHERE';
@@ -387,9 +389,9 @@
$sql = "SELECT
$table.*,fm_workorder.status,fm_workorder.charge_tenant,org_name,"
. "fm_workorder.claim_issued,
fm_workorder.paid_percent FROM $table"
- . " $this->left_join fm_workorder ON
fm_workorder.id = $table.pmwrkord_code"
- . " $this->left_join fm_project ON
fm_workorder.project_id = fm_project.id"
- . " $this->join fm_vendor ON $table.spvend_code
= fm_vendor.id $filtermethod";
+ . " {$this->left_join} fm_workorder ON
fm_workorder.id = $table.pmwrkord_code"
+ . " {$this->left_join} fm_project ON
fm_workorder.project_id = fm_project.id"
+ . " {$this->join} fm_vendor ON
$table.spvend_code = fm_vendor.id $filtermethod";
$this->db->query($sql . $ordermethod,__LINE__,__FILE__);
$this->total_records = $this->db->num_rows();
@@ -437,7 +439,104 @@
return $invoice;
}
+ function read_invoice_sub_sum($data)
+ {
+ $start = isset($data['start']) &&
$data['start'] ? (int)$data['start'] : 0;
+ $filter = isset($data['filter']) ?
$data['filter'] : 'none';
+ $sort = isset($data['sort']) ? $data['sort']
: 'DESC';
+ $order = isset($data['order']) ?
$data['order'] : '';
+ $voucher_id = isset($data['voucher_id']) &&
$data['voucher_id'] ? (int)$data['voucher_id'] : 0;
+ $paid = isset($data['paid']) ? $data['paid']
: '';
+ $project_id = isset($data['project_id']) &&
$data['project_id'] ? (int)$data['project_id'] : 0;
+ $order_id = isset($data['order_id']) &&
$data['order_id'] ? $data['order_id'] : 0 ;//might be bigint
+ if ($paid)
+ {
+ $table = 'fm_ecobilagoverf';
+ $overftid = ',overftid';
+ }
+ else
+ {
+ $table ='fm_ecobilag';
+ $overftid = '';
+ }
+
+ switch($order)
+ {
+ case 'dima':
+ case 'belop':
+ case 'spbudact_code':
+ case 'pmwrkord_code':
+ $ordermethod = " ORDER BY $order $sort";
+ break;
+ default:
+ $ordermethod = " ORDER BY pmwrkord_code
DESC";
+ }
+
+ $filtermethod = '';
+ $where = 'WHERE';
+
+ if ($voucher_id)
+ {
+ $filtermethod .= " {$where} bilagsnr=
'$voucher_id'";
+ $where = 'AND';
+ }
+
+ if ($order_id)
+ {
+ $filtermethod .= " {$where} pmwrkord_code=
'{$order_id}'";
+ $where = 'AND';
+ }
+
+ if ($project_id)
+ {
+ $filtermethod .= " {$where} fm_project.id =
'{$project_id}'";
+ $where = 'AND';
+ }
+
+ $groupmethod = "GROUP BY
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,"
+ . " currency,budsjettansvarligid,org_name";
+
+ $sql = "SELECT DISTINCT
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,sum(belop) as belop,
sum(godkjentbelop) as godkjentbelop,"
+ . " currency,budsjettansvarligid,org_name"
+ . " FROM $table"
+ . " {$this->join} fm_workorder ON
fm_workorder.id = $table.pmwrkord_code"
+ . " {$this->join} fm_project ON
fm_workorder.project_id = fm_project.id"
+ . " {$this->join} fm_vendor ON
{$table}.spvend_code = fm_vendor.id {$filtermethod} {$groupmethod}";
+
+ $this->db->query($sql . $ordermethod,__LINE__,__FILE__);
+ $this->total_records = $this->db->num_rows();
+
+ $values = array();
+ while ($this->db->next_record())
+ {
+ $values[] = array
+ (
+ 'workorder_id' =>
$this->db->f('pmwrkord_code'),
+ 'voucher_id' =>
$this->db->f('bilagsnr'),
+ 'voucher_out_id' =>
$this->db->f('bilagsnr_ut'),
+ 'invoice_id' =>
$this->db->f('fakturanr'),
+ 'amount'
=> $this->db->f('belop'),
+ 'approved_amount' =>
$this->db->f('godkjentbelop'),
+ 'vendor'
=> $this->db->f('org_name'),
+ 'currency'
=> $this->db->f('currency'),
+ 'budget_responsible' =>
$this->db->f('budsjettansvarligid')
+ );
+ }
+
+ foreach ($values as &$entry)
+ {
+ $sql = "SELECT budsjettsigndato{$overftid} FROM
$table WHERE pmwrkord_code = '{$entry['workorder_id']}' AND bilagsnr =
'{$entry['voucher_id']}' AND fakturanr = '{$entry['invoice_id']}'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ $entry['budsjettsigndato'] =
$this->db->f('budsjettsigndato');
+ $entry['transfer_time'] =
$this->db->f('overftid');
+ }
+
+ return $values;
+ }
+
+
function read_consume($data)
{
if(is_array($data))
Modified: branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-01-31 10:11:17 UTC (rev 8737)
+++ branches/Version-1_0-branch/property/inc/class.uiproject.inc.php
2012-01-31 10:13:46 UTC (rev 8738)
@@ -1647,8 +1647,8 @@
$invoices = array();
if ($id)
{
- $active_invoices =
execMethod('property.soinvoice.read_invoice_sub', array('project_id' => $id));
- $historical_invoices =
execMethod('property.soinvoice.read_invoice_sub', array('project_id' => $id,
'paid' => true));
+ $active_invoices =
execMethod('property.soinvoice.read_invoice_sub_sum', array('project_id' =>
$id));
+ $historical_invoices =
execMethod('property.soinvoice.read_invoice_sub_sum', array('project_id' =>
$id, 'paid' => true));
$invoices =
array_merge($active_invoices,$historical_invoices);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8738] Merge 8731:8737 from trunk,
Sigurd Nes <=