[Fmsystem-commits] [10619]

[Sigurd Nes]

Revision: 10619
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10619
Author:   sigurdne
Date:     2012-12-23 13:29:22 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/property/inc/class.sobudget.inc.php
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.soworkorder.inc.php
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/js/yahoo/project.edit.js

Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php   2012-12-21 16:45:42 UTC (rev 
10618)
+++ trunk/property/inc/class.sobudget.inc.php   2012-12-23 13:29:22 UTC (rev 
10619)
@@ -551,8 +551,8 @@
                        $end_periode = date('Ym',mktime(2,0,0,12,31,$year));
 
 
-                       $filtermethod .= " WHERE fm_workorder.start_date >= 
$start_date AND fm_workorder.start_date <= $end_date";
-//                     $filtermethod .= " WHERE fm_workorder_status.closed IS 
NULL AND fm_workorder.start_date >= $start_date AND fm_workorder.start_date <= 
$end_date";
+                       $filtermethod .= " WHERE (fm_workorder.start_date >= 
$start_date AND fm_workorder.start_date <= $end_date";
+                       $filtermethod .= " OR fm_workorder_status.closed IS 
NULL AND fm_workorder.start_date < $start_date)";
 
                        $where = 'AND';
 
@@ -638,7 +638,7 @@
                                $_taxcode[$this->db->f('id')] = 
$this->db->f('percent');
                        }
 
-                       $sql = "SELECT fm_workorder.id, 
fm_workorder_status.closed, fm_workorder.budget, 
combined_cost,fm_location1.mva,"
+                       $sql = "SELECT fm_workorder.id, 
fm_workorder_status.closed, fm_workorder.budget, 
combined_cost,fm_location1.mva,fm_workorder.start_date,"
                                . " 
fm_orders_actual_cost_view.actual_cost,pending_cost, 
fm_b_account.{$b_account_field} as {$b_account_field}, district_id, 
fm_workorder.ecodimb"
                                . " FROM fm_workorder"
                                . " {$this->join} fm_workorder_status ON 
fm_workorder.status = fm_workorder_status.id"
@@ -676,6 +676,14 @@
                                $_actual_cost = 
round($this->db->f('actual_cost')/$_taxfactor);
                //              $_actual_cost = 
round($this->db->f('actual_cost'));
                                $_obligation = $_combined_cost - $_actual_cost 
- $_pending_cost;
+
+                               
+                               // only current year
+                               if($this->db->f('start_date') < $start_date)
+                               {
+                                       $_actual_cost = 0;
+                               }
+
                                $sum_hits += 1;
 
                                if(!$this->db->f('closed'))

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2012-12-21 16:45:42 UTC (rev 
10618)
+++ trunk/property/inc/class.soproject.inc.php  2012-12-23 13:29:22 UTC (rev 
10619)
@@ -1665,15 +1665,17 @@
                        $project_budget = array();
                        $project_order_amount = array();
 
-                       $sql = "SELECT * FROM fm_project_budget WHERE 
project_id = {$project_id}";
+                       $sql = "SELECT fm_project_budget.year, 
fm_project_budget.month, fm_project_budget.budget, fm_project_budget.closed, 
fm_project_budget.active, sum(combined_cost) AS order_amount, start_date"
+                       . " FROM fm_project_budget {$this->left_join} 
fm_workorder ON fm_project_budget.project_id = fm_workorder.project_id WHERE 
fm_project_budget.project_id = {$project_id}"
+                       . " GROUP BY fm_project_budget.year, 
fm_project_budget.month, fm_project_budget.budget, fm_project_budget.closed, 
fm_project_budget.active,start_date";
                        $this->db->query($sql,__LINE__,__FILE__);
-
+//     _debug_array($sql);
                        while ($this->db->next_record())
                        {
                                $period = $this->db->f('year') . 
sprintf("%02s", $this->db->f('month'));
                                
                                $project_budget[$period] = 
(int)$this->db->f('budget');
-                               $project_order_amount[$period] = 
$this->db->f('order_amount');
+                               $project_order_amount[$period] = $period == 
date('Ym') ? $this->db->f('order_amount') : 0;
                                $closed_period[$period] = 
!!$this->db->f('closed');
                                $active_period[$period] = 
!!$this->db->f('active');
                        }

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2012-12-21 16:45:42 UTC 
(rev 10618)
+++ trunk/property/inc/class.soworkorder.inc.php        2012-12-23 13:29:22 UTC 
(rev 10619)
@@ -1715,6 +1715,8 @@
                        
                        }
 
+//FIXME : condsider removed
+/*
                        foreach ($periodization_outline as $outline)
                        {
                                $partial_amount = $combined_cost * 
$outline['value'] / 100;
@@ -1722,5 +1724,6 @@
                                $sql = "UPDATE fm_project_budget SET 
order_amount = order_amount + {$partial_amount} - {$old_combined_cost} WHERE 
project_id = {$project_id} AND year = {$year} AND month =" . 
(int)$outline['month'];
                                $this->db->query($sql,__LINE__,__FILE__);
                        }
+*/
                }
        }

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2012-12-21 16:45:42 UTC (rev 
10618)
+++ trunk/property/inc/class.uiproject.inc.php  2012-12-23 13:29:22 UTC (rev 
10619)
@@ -1924,6 +1924,11 @@
                        $periodization_list = 
$this->bo->get_periodizations_with_outline();
 
                        $sub_entry_action_data = array();
+                               $sub_entry_action_data = array
+                               (
+                                       'menuaction'    => 
'property.uiworkorder.edit',
+                                       'project_id'    => $id
+                               );
 
                        if($id && !$values['project_type_id']==3)
                        {

Modified: trunk/property/js/yahoo/project.edit.js
===================================================================
--- trunk/property/js/yahoo/project.edit.js     2012-12-21 16:45:42 UTC (rev 
10618)
+++ trunk/property/js/yahoo/project.edit.js     2012-12-23 13:29:22 UTC (rev 
10619)
@@ -154,9 +154,8 @@
        this.addFooterDatatable1 = function(paginator,datatable)
        {
                //call getTotalSum(name of column) in property.js
-               tmp_sum0 = getTotalSum('cost',0,paginator,datatable);
-
-               tmp_sum1 = getTotalSum('budget',0,paginator,datatable);
+               tmp_sum0 = getTotalSum('budget',0,paginator,datatable);
+               tmp_sum1 = getTotalSum('cost',0,paginator,datatable);
 /*
                tmp_sum2 = getTotalSum('calculation',2,paginator,datatable);
                tmp_sum3 = getTotalSum('contract_sum',2,paginator,datatable);