From fcf60152ed8fe3373f9dfe54ca5604e7446f995d Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 10 Nov 2019 01:37:06 +0100
Subject: [PATCH] recurring invoices - period improved.

---
 sales/create_recurrent_invoices.php | 44 +++++++++++++++--------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/sales/create_recurrent_invoices.php b/sales/create_recurrent_invoices.php
index 989c7d03..3f359f8c 100644
--- a/sales/create_recurrent_invoices.php
+++ b/sales/create_recurrent_invoices.php
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
-    Copyright (C) FrontAccounting, LLC.
+	Copyright (C) FrontAccounting, LLC.
 	Released under the terms of the GNU General Public License, GPL, 
 	as published by the Free Software Foundation, either version 3 
 	of the License, or (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+	See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_SALESINVOICE';
 $path_to_root = "..";
@@ -96,11 +96,11 @@ if ($id != -1)
 		whole invoiced time is <begin, end>
 		invoices are issued _after_ invoiced period is gone, eg:
 		begin 1.1
-		end   31.3
-		period:    invoice ready for issue since:
-		1.1-31.1 -  1.2
-		1.2-28.2 -  1.3
-		1.3-31.3 -  1.4
+		end	  31.3
+		period:	   invoice ready for issue since:
+		1.1-31.1 -	1.2
+		1.2-28.2 -	1.3
+		1.3-31.3 -	1.4
 		In example above, when end is set to 1.4 will generate additional invoice on 1.5 !
 	*/
 
@@ -114,7 +114,7 @@ if ($id != -1)
 	$invs = array();
 	if (recurrent_invoice_ready($id, $date))
 	{
- 			begin_transaction();
+			begin_transaction();
 
 			if ($myrow['debtor_no'] == 0)
 			{
@@ -179,8 +179,10 @@ if ($id != -1)
 		label_row(_('Template:'), get_customer_trans_view_str(ST_SALESORDER, $myrow["order_no"]));
 		label_row(_('Number of invoices:'), $count);
 		date_row(_('Invoice date:'), 'trans_date');
-		text_row(_('Invoice notice:'), 'memo', sprintf(_("Recurrent Invoice covers period %s - %s."), $from, add_days($to, -1)),
-			100, 100);
+		$newto = add_months($to, $myrow['monthly']);
+		$newto = add_days($newto, $myrow['days']);
+		text_row(_('Invoice notice:'), 'memo', sprintf(_("Recurrent Invoice covers period %s - %s."), $to,	 add_days($newto, -1)), 100, 100);
+		//text_row(_('Invoice notice:'), 'memo', sprintf(_("Recurrent Invoice covers period %s - %s."), //$from, add_days($to, -1)), 100, 100);
 		end_table();
 		hidden('from', $from, true);
 		hidden('to', $to, true);
@@ -229,20 +231,20 @@ while ($myrow = db_fetch($result))
 	label_cell($myrow["days"]);
 	label_cell($myrow['monthly']);
 	label_cell(sql2date($myrow['begin']),  "align='center'");
-	label_cell(sql2date($myrow['end']),  "align='center'");
-	label_cell(calculate_next($myrow),  "align='center'");
- 	if ($myrow['overdue'])
- 	{
+	label_cell(sql2date($myrow['end']),	 "align='center'");
+	label_cell(calculate_next($myrow),	"align='center'");
+	if ($myrow['overdue'])
+	{
 		$count = recurrent_invoice_count($myrow['id']);
- 		if ($count)
- 		{
+		if ($count)
+		{
 			button_cell("create".$myrow["id"], sprintf(_("Create %s Invoice(s)"), $count), "", ICON_DOC, 'process');
 		} else {
 			label_cell('');
 		}
 	}
- 	else
- 		label_cell("");
+	else
+		label_cell("");
 	end_row();
 }
 end_table();
-- 
2.30.2