CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/09/28 19:47:47
Modified files:
inc : class.soproject.inc.php
class.soworkorder.inc.php
class.uiwo_hour.inc.php
Log message:
update
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soproject.inc.php?cvsroot=phpgroupware&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soworkorder.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiwo_hour.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
Patches:
Index: class.soproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- class.soproject.inc.php 25 Sep 2007 10:30:15 -0000 1.44
+++ class.soproject.inc.php 28 Sep 2007 19:47:46 -0000 1.45
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soproject.inc.php,v 1.44 2007/09/25 10:30:15
sigurdne Exp $
+ * @version $Id: class.soproject.inc.php,v 1.45 2007/09/28 19:47:46
sigurdne Exp $
*/
/**
@@ -168,7 +168,7 @@
$uicols['descr'][] =
lang('Coordinator');
$uicols['statustext'][] = lang('Project
coordinator');
- $cols.= ",fm_project.budget";
+ $cols.= ",(fm_project.budget +
fm_project.reserve) as budget";
$cols_return[] =
'budget';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'budget';
@@ -263,13 +263,10 @@
{
$filtermethod .= " $where
fm_wo_hours_category.id=$wo_hour_cat_id ";
$where= 'AND';
- $group_method = ' GROUP BY
fm_project.location_code,fm_project.id
,fm_project.start_date,fm_project.name,account_lid
,fm_project.user_id,fm_project.address,fm_project.budget';
- }
- else
- {
- $group_method = ' GROUP BY
fm_project.location_code,fm_project.id,fm_project.start_date,fm_project.name,phpgw_accounts.account_lid,fm_project.user_id,fm_project.address,fm_project.budget';
}
+ $group_method = ' GROUP BY
fm_project.location_code,fm_project.id,fm_project.start_date,fm_project.name,phpgw_accounts.account_lid,fm_project.user_id,fm_project.address,fm_project.budget,fm_project.reserve';
+
if ($filter=='all')
{
if (is_array($this->grants))
@@ -378,7 +375,7 @@
$project['key_deliver'] =
$this->db->f('key_deliver');
$project['other_branch'] =
$this->db->f('other_branch');
$project['key_responsible'] =
$this->db->f('key_responsible');
- $project['descr'] =
$this->db->f('descr');
+ $project['descr'] =
stripslashes($this->db->f('descr'));
$project['status'] =
$this->db->f('status');
$project['budget'] =
(int)$this->db->f('budget');
$project['reserve'] =
(int)$this->db->f('reserve');
Index: class.soworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.soworkorder.inc.php 9 Aug 2007 11:33:27 -0000 1.30
+++ class.soworkorder.inc.php 28 Sep 2007 19:47:46 -0000 1.31
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soworkorder.inc.php,v 1.30 2007/08/09 11:33:27
sigurdne Exp $
+ * @version $Id: class.soworkorder.inc.php,v 1.31 2007/09/28 19:47:46
sigurdne Exp $
*/
/**
@@ -446,10 +446,10 @@
$workorder['key_deliver'] =
$this->db->f('key_deliver');
$workorder['key_responsible'] =
$this->db->f('key_responsible');
$workorder['charge_tenant'] =
$this->db->f('charge_tenant');
- $workorder['descr']
= $this->db->f('descr');
+ $workorder['descr']
= stripslashes($this->db->f('descr'));
$workorder['status'] =
$this->db->f('status');
$workorder['budget'] =
(int)$this->db->f('budget');
- $workorder['calculation']
=
($this->db->f('calculation')*(1+$this->db->f('addition')/100))+$this->db->f('rig_addition');
+ $workorder['calculation']
=
$this->db->f('calculation')>0?($this->db->f('calculation')*(1+$this->db->f('addition')/100))+$this->db->f('rig_addition'):0;
$workorder['b_account_id']
= (int)$this->db->f('account_id');
$workorder['addition_percentage'] =
(int)$this->db->f('addition');
$workorder['addition_rs']
= (int)$this->db->f('rig_addition');
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- class.uiwo_hour.inc.php 29 Mar 2007 11:26:44 -0000 1.34
+++ class.uiwo_hour.inc.php 28 Sep 2007 19:47:47 -0000 1.35
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiwo_hour.inc.php,v 1.34 2007/03/29 11:26:44
sigurdne Exp $
+ * @version $Id: class.uiwo_hour.inc.php,v 1.35 2007/09/28 19:47:47
sigurdne Exp $
*/
/**
@@ -402,7 +402,7 @@
$sum_tax = ($sum_result + $addition_percentage +
$workorder['addition_rs'])*$tax/100;
$total_sum = $sum_result + $addition_percentage +
$workorder['addition_rs'] + $sum_tax;
-
$this->bo->update_calculation(array('workorder_id'=>$workorder_id,'calculation'=>($sum_result+$addition_percentage
+ $workorder['addition_rs'])));
+
$this->bo->update_calculation(array('workorder_id'=>$workorder_id,'calculation'=>($sum_result+$addition_percentage)));
$table_sum[] = array
(
_______________________________________________
phpGroupWare-cvs mailing list
phpGroupWare-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs
