[Fmsystem-commits] [8947]

[Erik Holm-Larsen]

Revision: 8947
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8947
Author:   erikhl
Date:     2012-02-23 10:06:29 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/rental/inc/class.sobilling.inc.php
    trunk/rental/inc/class.sobilling_info.inc.php
    trunk/rental/inc/class.soinvoice.inc.php

Modified: trunk/rental/inc/class.sobilling.inc.php
===================================================================
--- trunk/rental/inc/class.sobilling.inc.php    2012-02-22 10:28:35 UTC (rev 
8946)
+++ trunk/rental/inc/class.sobilling.inc.php    2012-02-23 10:06:29 UTC (rev 
8947)
@@ -116,7 +116,7 @@
                                $billing_info->set_term_label(lang('annually'));
                        }
                        else if($billing_info->get_term_id() == 3){ // half year
-                               if($billing_info->get_month() == 7){
+                               if($billing_info->get_month() == 6){
                                        
$billing_info->set_term_label(lang('first_half'));
                                }
                                else{

Modified: trunk/rental/inc/class.sobilling_info.inc.php
===================================================================
--- trunk/rental/inc/class.sobilling_info.inc.php       2012-02-22 10:28:35 UTC 
(rev 8946)
+++ trunk/rental/inc/class.sobilling_info.inc.php       2012-02-23 10:06:29 UTC 
(rev 8947)
@@ -64,7 +64,7 @@
                
                $tables = "rental_billing_info";
                $joins = '';
-               
+               var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}");
                return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
        }
        
@@ -82,7 +82,7 @@
                                $billing_info->set_term_label(lang('annually'));
                        }
                        else if($billing_info->get_term_id() == 3){ // half year
-                               if($billing_info->get_month() == 7){
+                               if($billing_info->get_month() == 6){
                                        
$billing_info->set_term_label(lang('first_half'));
                                }
                                else{

Modified: trunk/rental/inc/class.soinvoice.inc.php
===================================================================
--- trunk/rental/inc/class.soinvoice.inc.php    2012-02-22 10:28:35 UTC (rev 
8946)
+++ trunk/rental/inc/class.soinvoice.inc.php    2012-02-23 10:06:29 UTC (rev 
8947)
@@ -119,7 +119,7 @@
                                $invoice->set_term_label(lang('annually'));
                        }
                        else if($invoice->get_term_id() == 3){ // half year
-                               if($invoice->get_month() == 7){
+                               if($invoice->get_month() == 6){
                                        
$invoice->set_term_label(lang('first_half'));
                                }
                                else{