From: Alexander Marx <alexander.marx@ipfire.org>
Date: Fri, 2 Jan 2015 06:46:21 +0000 (+0100)
Subject: BUG10693: Fix wrong monthnumber in PDF Bill
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2FBUG10693;p=people%2Famarx%2Fipfire-2.x.git

BUG10693: Fix wrong monthnumber in PDF Bill
---

diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index 826be26b1..7969a5023 100644
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -392,6 +392,7 @@ sub pdf2 {
 	my @billar		= @{$_[0]}; #DATA from sendbill (just host/values)
 	my $month		= $_[1];
 	$month			= '0'.$month if $month < 10;
+	$month			= '12' if $month == 0;
 	my $year 		= $_[2];
 	my $mwst		= $_[3];
 	my @address_cust= @{$_[4]}; #Array which contains customer and hoster adresses and some additional info from billgroup
diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl
index d535901b6..79fc7bae4 100755
--- a/src/squid-accounting/acct.pl
+++ b/src/squid-accounting/acct.pl
@@ -210,7 +210,9 @@ sub sendbill {
 	my @now = localtime(time);
 	$now[5] = $now[5] + 1900;
 	my $actmonth = $now[4];
-	my $month			= '0'.$actmonth if $actmonth < 10;
+	my $month;
+	$month = '0'.$actmonth if $actmonth < 10;
+	$month = '12' if $actmonth == 0;
 	my $actyear  = $now[5];
 	my ($from,$till)=&ACCT::getmonth($actmonth,$actyear);					#FIXME month and year as variables!
 	my @billar = &ACCT::GetTaValues($from,$till,$rggrp);