Creating recurrent invoices with date outside fiscal year

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5461f6d9cf03341197378d7b9b5e97830d4aa8d9..556c5bb331df3a4658c8988f4c563edadf119a2f 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -38,6 +38,8 @@ $ /purchasing/supplier_payment.php
   /reporting/includes/pdf_report.inc
   /reporting/includes/reporting.inc
   /reporting/includes/reports_classes.inc
   /reporting/includes/pdf_report.inc
   /reporting/includes/reporting.inc
   /reporting/includes/reports_classes.inc

+# Creating recurrent invoices with date outside fiscal year.  
+  /sales/create_recurrent_invoices.php

   
 06-Jan-2010 Janusz Dobrowolski
 # Check on existence of locale.inc added to avoid blank pages when the file is broken.
   
 06-Jan-2010 Janusz Dobrowolski
 # Check on existence of locale.inc added to avoid blank pages when the file is broken.

diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php
index dafc08ac7450adadcc448118a49de879b136a2f8..c38a3ae3387ad37bf2d7d7d8e19598747037afc6 100644 (file)
--- a/sales/create_recurrent_invoices.php
+++ b/sales/create_recurrent_invoices.php
@@ -61,39 +61,45 @@ function create_recurrent_invoices($customer_id, $branch_id, $order_no, $tmpl_no
 
 if (isset($_GET['recurrent']))
 {
 
 if (isset($_GET['recurrent']))
 {

-       $invs = array();
-       $sql = "SELECT * FROM ".TB_PREF."recurrent_invoices WHERE id=".db_escape($_GET['recurrent']);
-
-       $result = db_query($sql,"could not get recurrent invoice");
-       $myrow = db_fetch($result);
-       if ($myrow['debtor_no'] == 0)
+       $date = Today();
+       if (is_date_in_fiscalyear($date))

        {
        {

-               $cust = get_cust_branches_from_group($myrow['group_no']);
-               while ($row = db_fetch($cust))
+               $invs = array();
+               $sql = "SELECT * FROM ".TB_PREF."recurrent_invoices WHERE id=".db_escape($_GET['recurrent']);
+
+               $result = db_query($sql,"could not get recurrent invoice");
+               $myrow = db_fetch($result);
+               if ($myrow['debtor_no'] == 0)
+               {
+                       $cust = get_cust_branches_from_group($myrow['group_no']);
+                       while ($row = db_fetch($cust))
+                       {
+                               $invs[] = create_recurrent_invoices($row['debtor_no'], $row['branch_code'], $myrow['order_no'], $myrow['id']);
+                       }       
+               }
+               else

                {
                {

-                       $invs[] = create_recurrent_invoices($row['debtor_no'], $row['branch_code'], $myrow['order_no'], $myrow['id']);
-               }       
+                       $invs[] = create_recurrent_invoices($myrow['debtor_no'], $myrow['group_no'], $myrow['order_no'], $myrow['id']);
+               }
+               if (count($invs) > 0)
+               {
+                       $min = min($invs);
+                       $max = max($invs);
+               }
+               else 
+                       $min = $max = 0;
+               display_notification(sprintf(_("%s recurrent invoice(s) created, # $min - # $max."), count($invs)));
+               if (count($invs) > 0)
+               {
+                       $ar = array('PARAM_0' => $min,  'PARAM_1' => $max, 'PARAM_2' => "",
+                               'PARAM_3' => 0, 'PARAM_4' => 0, 'PARAM_5' => "", 'PARAM_6' => ST_SALESINVOICE);
+                       display_note(print_link(_("&Print Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1);
+                       $ar['PARAM_3'] = 1; 
+                       display_note(print_link(_("&Email Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1);
+               }

        }
        else
        }
        else

-       {
-               $invs[] = create_recurrent_invoices($myrow['debtor_no'], $myrow['group_no'], $myrow['order_no'], $myrow['id']);
-       }
-       if (count($invs) > 0)
-       {
-               $min = min($invs);
-               $max = max($invs);
-       }
-       else 
-               $min = $max = 0;
-       display_notification(sprintf(_("%s recurrent invoice(s) created, # $min - # $max."), count($invs)));
-       if (count($invs) > 0)
-       {
-               $ar = array('PARAM_0' => $min,  'PARAM_1' => $max, 'PARAM_2' => "",
-                       'PARAM_3' => 0, 'PARAM_4' => 0, 'PARAM_5' => "", 'PARAM_6' => ST_SALESINVOICE);
-               display_note(print_link(_("&Print Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1);
-               $ar['PARAM_3'] = 1; 
-               display_note(print_link(_("&Email Recurrent Invoices # $min - # $max"), 107, $ar), 0, 1);
-       }
+               display_error(_("The entered date is not in fiscal year."));

 }      
 
 //-------------------------------------------------------------------------------------------------
 }      
 
 //-------------------------------------------------------------------------------------------------