[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10689] property: budget handling
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [10689] property: budget handling |
Date: |
Fri, 18 Jan 2013 09:47:33 +0000 |
Revision: 10689
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10689
Author: sigurdne
Date: 2013-01-18 09:47:33 +0000 (Fri, 18 Jan 2013)
Log Message:
-----------
property: budget handling
Modified Paths:
--------------
trunk/property/inc/class.sowo_hour.inc.php
Modified: trunk/property/inc/class.sowo_hour.inc.php
===================================================================
--- trunk/property/inc/class.sowo_hour.inc.php 2013-01-18 09:32:49 UTC (rev
10688)
+++ trunk/property/inc/class.sowo_hour.inc.php 2013-01-18 09:47:33 UTC (rev
10689)
@@ -758,15 +758,18 @@
$budget =
$this->db->f('budget');
$contract_sum = $this->db->f('contract_sum');
- $this->db->query("SELECT periodization_id"
+ $this->db->query("SELECT periodization_id,
contract_sum"
. " FROM fm_workorder {$this->join} fm_project
ON (fm_workorder.project_id = fm_project.id)"
. " WHERE fm_workorder.id =
'{$id}'",__LINE__,__FILE__);
$this->db->next_record();
$periodization_id =
$this->db->f('periodization_id');
-
- $soworkorder->_update_order_budget($id,
date('Y'), $periodization_id, $budget , $contract_sum, $calculation);
+ $contract_sum =
$this->db->f('contract_sum');
+ if(!abs($contract_sum) > 0)
+ {
+ $soworkorder->_update_order_budget($id,
date('Y'), $periodization_id, $budget , $contract_sum, $calculation);
+ }
}
$this->db->transaction_commit();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10689] property: budget handling,
Sigurd Nes <=