[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 132557976f619a6c9b361442d5c4993eee588cc2

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 132557976f619a6c9b361442d5c4993eee588cc2

[git]

[-- Attachment #1: Type: text/plain, Size: 3063 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  132557976f619a6c9b361442d5c4993eee588cc2 (commit)
       via  218d2d75f5b47bcfe92b98fb888edb690aa9eeae (commit)
      from  764bedefb3d8d7085a0c623290541a5b62e1ec13 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 132557976f619a6c9b361442d5c4993eee588cc2
Merge: 218d2d7 764bede
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Fri Jan 2 10:22:42 2015 +0100

    Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

commit 218d2d75f5b47bcfe92b98fb888edb690aa9eeae
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Fri Jan 2 07:46:21 2015 +0100

    BUG10693: Fix wrong monthnumber in PDF Bill

-----------------------------------------------------------------------

Summary of changes:
 lfs/squid-accounting             | 2 +-
 src/squid-accounting/acct-lib.pl | 1 +
 src/squid-accounting/acct.pl     | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index 0dca63f..9ef8324 100644
--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -15,7 +15,7 @@ THISAPP    = squid-accounting-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squid-accounting
-PAK_VER    = 3
+PAK_VER    = 4
 
 DEPS       = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards perl-PDF-API2 sendEmail"
 
diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index a19140d..bac1e36 100644
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -387,6 +387,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 d535901..79fc7ba 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);


hooks/post-receive
--
IPFire 2.x development tree