[Fmsystem-commits] [11029] property: budget handling

[Sigurd Nes]

Revision: 11029
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11029
Author:   sigurdne
Date:     2013-04-05 13:05:07 +0000 (Fri, 05 Apr 2013)
Log Message:
-----------
property: budget handling

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.uiinvoice2.inc.php
    trunk/property/setup/phpgw_no.lang

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2013-04-05 11:13:40 UTC (rev 
11028)
+++ trunk/property/inc/class.soproject.inc.php  2013-04-05 13:05:07 UTC (rev 
11029)
@@ -833,7 +833,9 @@
                {
                        $project_id = (int) $project_id;
                        $project = array();
-                       $sql = "SELECT * FROM fm_project WHERE 
id={$project_id}";
+                       $sql = "SELECT fm_project.*, fm_project_status.closed 
FROM fm_project"
+                       . " {$this->join} fm_project_status ON 
fm_project.status = fm_project_status.id" 
+                       . " WHERE fm_project.id={$project_id}";
 
                        $this->db->query($sql,__LINE__,__FILE__);
 
@@ -853,6 +855,7 @@
                                        'key_responsible'               => 
$this->db->f('key_responsible'),
                                        'descr'                                 
=> $this->db->f('descr', true),
                                        'status'                                
=> $this->db->f('status'),
+                                       'closed'                                
=> $this->db->f('closed'),
                                        'budget'                                
=> (int)$this->db->f('budget'),
                        //              'planned_cost'                  => 
(int)$this->db->f('planned_cost'),
                                        'reserve'                               
=> (int)$this->db->f('reserve'),

Modified: trunk/property/inc/class.uiinvoice2.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice2.inc.php 2013-04-05 11:13:40 UTC (rev 
11028)
+++ trunk/property/inc/class.uiinvoice2.inc.php 2013-04-05 13:05:07 UTC (rev 
11029)
@@ -132,6 +132,15 @@
 
                        if($values = phpgw::get_var('values'))
                        {
+                               $order = 
execMethod('property.soworkorder.read_single',$values['order_id']);
+                               $project = 
execMethod('property.soproject.read_single', $order['project_id']);
+                               
+                               if($project['closed'])
+                               {
+                                       $receipt['error'][]=true;               
                
+                                       
phpgwapi_cache::message_set(lang('Project is closed'), 'error');
+                               }
+                               
                                $approve = 
execMethod('property.boinvoice.get_approve_role',  $values['dim_b']);
 
                                if(!$approve)

Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang  2013-04-05 11:13:40 UTC (rev 11028)
+++ trunk/property/setup/phpgw_no.lang  2013-04-05 13:05:07 UTC (rev 11029)
@@ -1330,6 +1330,7 @@
 project group  property        no      Agresso prosjekt
 project id     property        no      Prosjekt ID
 project info   property        no      Prosjekt info.
+Project is closed      property        no      Prosjektet er avsluttet.
 project name   property        no      Prosjekt navn
 .project.request       property        no      Behov
 project start date     property        no      prosjekt startdato