[Fmsystem-commits] [6575] rental: updated contracts list for regulations

[Joakim Hop]

Revision: 6575
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6575
Author:   joakim_hop
Date:     2010-11-10 13:00:09 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
rental:  updated contracts list for regulations

Modified Paths:
--------------
    trunk/rental/inc/class.socontract.inc.php
    trunk/rental/inc/class.uicontract.inc.php

Modified: trunk/rental/inc/class.socontract.inc.php
===================================================================
--- trunk/rental/inc/class.socontract.inc.php   2010-11-10 12:16:44 UTC (rev 
6574)
+++ trunk/rental/inc/class.socontract.inc.php   2010-11-10 13:00:09 UTC (rev 
6575)
@@ -179,9 +179,15 @@
                        $adjustment_interval = 
$this->marshal($filters['adjustment_interval'],'int');
                        $adjustment_year = 
$this->marshal($filters['adjustment_year'],'int');
                        
+                       if($this->marshal($filters['adjustment_is_executed'])){
+                               $filter_clauses[] = "contract.adjustment_year = 
{$adjustment_year}";
+                       }
+                       else{
+                               $filter_clauses[] = "contract.adjustment_year + 
{$adjustment_interval} = {$adjustment_year}";
+                       }
                        $filter_clauses[] = "contract.adjustable IS true";
                        $filter_clauses[] = "contract.adjustment_interval = 
{$adjustment_interval}";
-                       $filter_clauses[] = "contract.adjustment_year + 
{$adjustment_interval} = {$adjustment_year}";
+                       
                }
                
                /* 

Modified: trunk/rental/inc/class.uicontract.inc.php
===================================================================
--- trunk/rental/inc/class.uicontract.inc.php   2010-11-10 12:16:44 UTC (rev 
6574)
+++ trunk/rental/inc/class.uicontract.inc.php   2010-11-10 13:00:09 UTC (rev 
6575)
@@ -80,7 +80,7 @@
                                case 'contracts_for_adjustment':
                                        $adjustment_id = 
(int)phpgw::get_var('id');
                                        $adjustment = 
rental_soadjustment::get_instance()->get_single($adjustment_id);
-                                       $filters = array('contract_type' => 
$adjustment->get_responsibility_id(), 'adjustment_interval' => 
$adjustment->get_interval(), 'adjustment_year' => $adjustment->get_year());
+                                       $filters = array('contract_type' => 
$adjustment->get_responsibility_id(), 'adjustment_interval' => 
$adjustment->get_interval(), 'adjustment_year' => $adjustment->get_year(), 
'adjustment_is_executed' => $adjustment->is_executed());
                                        break;
                                case 'contracts_part':                          
                // Contracts for this party
                                        $filters = array('party_id' => 
phpgw::get_var('party_id'),'contract_status' => 
phpgw::get_var('contract_status'), 'contract_type' => 
phpgw::get_var('contract_type'), 'status_date_hidden' => 
phpgw::get_var('status_date_hidden'));