[SCM] Debian packaging of eekboek branch, master, updated. upstream/2.01.02-205-g06d8712
Thijs Kinkhorst
thijs at uvt.nl
Sat Mar 10 14:35:43 UTC 2012
The following commit has been merged in the master branch:
commit 06d8712f267294caec9a2689f01bbc05dbfab840
Author: Thijs Kinkhorst <thijs at uvt.nl>
Date: Sat Mar 10 15:35:24 2012 +0100
New upstream stable release 2.00.04.
diff --git a/CHANGES b/CHANGES
index 7011d38..005ce1e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,28 @@
-2.00.03
+2.00.04
+
+ * Fix bug 3499522.
+
+ Een IV boeking waarbij een BTW tariefgroep Privé of Anders
+ was betrokken, werd abusievelijk op de grootboekrekening
+ voor BTW Laag geboekt. In geval van een verkoopboeking kwam
+ het BTW bedrag niet in de juiste rubriek van de BTW aangifte
+ terecht.
+
+ (Voor inkoopboekingen was de impact op de BTW aangifte
+ nihil.)
+
+ * Fix fout bij opvragen hulp voor BTW aangifte.
+
+ * Fix typo in enkele boodschappen (Issue #3477452).
+
+2.00.03 2011-03-22
* (schema) Fix probleem dat het gebruik van een
ongedefinieerde BTW tariefgroep onopgemerkt bleef wanneer er
wel een groep was gedefinieerd met een afwijkende
exclusiviteit.
-2.00.02 2010-05-06
+2.00.02 2010-05-06
* (ebwxshell, linux) Workaround voor het HTML rendering
probleem met wxPerl versies 0.95 en 0.95.
diff --git a/EekBoek.spec b/EekBoek.spec
index 946dac7..452feb7 100644
--- a/EekBoek.spec
+++ b/EekBoek.spec
@@ -10,7 +10,7 @@ Name: EekBoek
Summary: Bookkeeping software for small and medium-size businesses
License: GPL+ or Artistic
Group: Applications/Productivity
-Version: 2.00.03
+Version: 2.00.04
Release: 1%{?dist}
Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
URL: http://www.eekboek.nl
@@ -96,8 +96,8 @@ This package contains the wxWidgets (GUI) extension for %{name}.
# This package only contains the necessary module(s) for EekBoek
# to use the PostgreSQL database.
-# Installing this package will pull in the core package and
-# the Perl PostgreSQL modules.
+# Installing this package will pull in the main package and
+# the Perl PostgreSQL modules, if necessary.
# No %%doc required.
Summary: PostgreSQL database driver for %{name}
@@ -238,7 +238,10 @@ done
%{ebshare}/lib/EB/DB/Postgres.pm
%changelog
-* Tue Mar 22 2011 Johan Vromans <jvromans at squirrel.nl> - 2.00.03
+* Fri Mar 09 2012 Johan Vromans <jvromans at squirrel.nl> - 2.00.04-1
+- Upgrade to upstream 2.00.04.
+
+* Tue Mar 22 2011 Johan Vromans <jvromans at squirrel.nl> - 2.00.03-1
- Upgrade to upstream 2.00.03.
* Thu May 06 2010 Johan Vromans <jvromans at squirrel.nl> - 2.00.02-1
diff --git a/META.yml b/META.yml
index 760eba2..832c64d 100644
--- a/META.yml
+++ b/META.yml
@@ -1,6 +1,6 @@
---
name: EekBoek
-version: 2.00.02
+version: 2.00.04
author:
- Johan Vromans (jvromans at squirrel.nl)
abstract: Elementary Bookkeeping (for the Dutch/European market)
@@ -27,12 +27,12 @@ provides:
EekBoek:
file: lib/EekBoek.pm
version: !!perl/hash:Module::Build::Version
- original: 2.00.02
+ original: 2.00.04
qv: 1
version:
- 2
- 0
- - 2
+ - 4
generated_by: Module::Build version 0.32
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
diff --git a/debian/changelog b/debian/changelog
index 9d4b6ab..264ee74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-eekboek (2.00.03-2) UNRELEASED; urgency=low
+eekboek (2.00.04-1) UNRELEASED; urgency=low
TODO:
- check/fix bugs: #584608, #584609
- double-check my changes
- check if it still works :)
+ [ Thijs Kinkhorst ]
+ * New upstream release.
+
[ gregor herrmann ]
* Remove alternative (build) dependencies that are already satisfied
in oldstable.
@@ -26,7 +29,8 @@ eekboek (2.00.03-2) UNRELEASED; urgency=low
* debian/control: add ${perl:Depends}.
* debian/rules: fix manpage sections.
- -- gregor herrmann <gregoa at debian.org> Sat, 21 Jan 2012 18:41:51 +0100
+
+ -- Thijs Kinkhorst <thijs at debian.org> Sat, 10 Mar 2012 15:34:35 +0100
eekboek (2.00.03-1) unstable; urgency=low
diff --git a/lib/EB/Booking/BKM.pm b/lib/EB/Booking/BKM.pm
index 0b74855..25bf4b0 100644
--- a/lib/EB/Booking/BKM.pm
+++ b/lib/EB/Booking/BKM.pm
@@ -11,8 +11,8 @@ package EB::Booking::BKM;
# Author : Johan Vromans
# Created On : Thu Jul 7 14:50:41 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Fri Apr 3 12:09:00 2009
-# Update Count : 527
+# Last Modified On: Fri Mar 9 08:31:03 2012
+# Update Count : 528
# Status : Unknown, Use with caution!
################ Common stuff ################
@@ -573,7 +573,7 @@ sub perform {
$dbh->store_journal($self->journalise($bsk_id));
if ( $opts->{journal} ) {
- warn("?"._T("Dit overicht is ter referentie, de boeking is niet uitgevoerd!")."\n") if $fail;
+ warn("?"._T("Dit overzicht is ter referentie, de boeking is niet uitgevoerd!")."\n") if $fail;
EB::Report::Journal->new->journal
({select => $bsk_id,
d_boekjaar => $bky,
diff --git a/lib/EB/Booking/IV.pm b/lib/EB/Booking/IV.pm
index 8cfdae3..cc6a1be 100644
--- a/lib/EB/Booking/IV.pm
+++ b/lib/EB/Booking/IV.pm
@@ -13,8 +13,8 @@ package EB::Booking::IV;
# Author : Johan Vromans
# Created On : Thu Jul 7 14:50:41 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Wed Oct 14 23:08:11 2009
-# Update Count : 307
+# Last Modified On: Fri Mar 9 08:30:41 2012
+# Update Count : 309
# Status : Unknown, Use with caution!
################ Common stuff ################
@@ -263,9 +263,9 @@ sub perform {
warn("?".__x("Onbekende BTW-code: {code}", code => $btw_id)."\n");
return;
}
- my $t = "btw_" . ($iv ? "i" : "v");
- $t .= $tg == BTWTARIEF_HOOG ? 'h' : 'l';
- $btw_acc = $dbh->std_acc($t);
+ my $tp = BTWTARIEVEN->[$tg];
+ my $t = qw(v i)[$iv] . lc(substr($tp, 0, 1));
+ $btw_acc = $dbh->std_acc("btw_$t");
}
}
elsif ( $btw_id ) {
@@ -303,7 +303,7 @@ sub perform {
$tot = -$tot if $iv;
my $fail = defined($totaal) && $tot != $totaal;
if ( $opts->{journal} ) {
- warn("?"._T("Dit overicht is ter referentie, de boeking is niet uitgevoerd!")."\n") if $fail;
+ warn("?"._T("Dit overzicht is ter referentie, de boeking is niet uitgevoerd!")."\n") if $fail;
EB::Report::Journal->new->journal
({select => $bsk_id,
d_boekjaar => $bky,
diff --git a/lib/EB/Report/BTWAangifte.pm b/lib/EB/Report/BTWAangifte.pm
index 30240e4..7a25f99 100644
--- a/lib/EB/Report/BTWAangifte.pm
+++ b/lib/EB/Report/BTWAangifte.pm
@@ -6,8 +6,8 @@ use utf8;
# Author : Johan Vromans
# Created On : Tue Jul 19 19:01:33 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Sat Oct 24 14:43:49 2009
-# Update Count : 642
+# Last Modified On: Fri Mar 9 08:24:20 2012
+# Update Count : 643
# Status : Unknown, Use with caution!
################ Common stuff ################
@@ -526,9 +526,11 @@ sub collect {
# 5b. Voorbelasting
my ($vb) = @{$dbh->do("SELECT SUM(jnl_amount)".
" FROM Journal".
- " WHERE ( jnl_acc_id = ? OR jnl_acc_id = ? )".
+ " WHERE ( jnl_acc_id = ? OR jnl_acc_id = ?".
+ " OR jnl_acc_id = ? OR jnl_acc_id = ? )".
" AND jnl_bsr_date >= ? AND jnl_bsr_date <= ?",
$dbh->std_acc("btw_ih"), $dbh->std_acc("btw_il"),
+ $dbh->std_acc("btw_ia",0), $dbh->std_acc("btw_ip",0),
$begin, $end)};
$vb ||= 0; # prevent warnings
my $btw_i_delta = $vb - $crd_btw - $intra_crd_btw;
diff --git a/lib/EB/Shell.pm b/lib/EB/Shell.pm
index 9f7e50c..174ab88 100644
--- a/lib/EB/Shell.pm
+++ b/lib/EB/Shell.pm
@@ -715,7 +715,7 @@ sub _do_btwaangifte {
"noreport",
"noround",
], $opts)
- or goto &_help_btwaangifte;
+ or goto &help_btwaangifte;
if ( @args && lc($args[-1]) eq "definitief" ) {
$opts->{close} = 1;
diff --git a/lib/EekBoek.pm b/lib/EekBoek.pm
index 772231c..baec02d 100644
--- a/lib/EekBoek.pm
+++ b/lib/EekBoek.pm
@@ -12,7 +12,7 @@ use 5.008003;
my $RCS_Id = '$Id: EekBoek.pm,v 1.101 2010/05/06 10:03:08 jv Exp $ ';
our $PACKAGE = 'EekBoek';
-our $VERSION = '2.00.03';
+our $VERSION = '2.00.04';
=head1 NAME
diff --git a/lib/EekBoek.pm~ b/lib/EekBoek.pm~
deleted file mode 100644
index b1468a4..0000000
--- a/lib/EekBoek.pm~
+++ /dev/null
@@ -1,66 +0,0 @@
-#! perl -- -*- coding: utf-8 -*-
-
-package EekBoek;
-
-# NOTE: This is a documentation-only module.
-
-use strict;
-use utf8;
-
-# Minimal version to prevent many Unicode bugs.
-use 5.008003;
-
-my $RCS_Id = '$Id: EekBoek.pm,v 1.101 2010/05/06 10:03:08 jv Exp $ ';
-our $PACKAGE = 'EekBoek';
-our $VERSION = '2.00.02';
-
-=head1 NAME
-
-EekBoek - Bookkeeping software for small and medium-size businesses
-
-=head1 SYNOPSIS
-
-EekBoek is a bookkeeping package for small and medium-size businesses.
-Unlike other accounting software, EekBoek has both a command-line
-interface (CLI) and a graphical user-interface (GUI). Furthermore, it
-has a complete Perl API to create your own custom applications.
-
-EekBoek is designed for the Dutch/European market and currently
-available in Dutch only. An English translation is in the works (help
-appreciated).
-
-=head1 DESCRIPTION
-
-For a description how to use the program, see L<http://www.eekboek.nl/docs/index.html>.
-
-=head1 BUGS AND PROBLEMS
-
-Please use the eekboek-users mailing list at SourceForge.
-
-=head1 AUTHOR AND CREDITS
-
-Johan Vromans (jvromans at squirrel.nl) wrote this module.
-
-Web site: L<http://www.eekboek.nl>.
-
-=head1 COPYRIGHT AND DISCLAIMER
-
-This program is Copyright 2005-2010 by Squirrel Consultancy. All
-rights reserved.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of either: a) the GNU General Public License as
-published by the Free Software Foundation; either version 1, or (at
-your option) any later version, or b) the "Artistic License" which
-comes with Perl.
-
-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 either the
-GNU General Public License or the Artistic License for more details.
-
-=cut
-
-1;
-
-# $Id: EekBoek.pm,v 1.101 2010/05/06 10:03:08 jv Exp $
diff --git a/script/ebshell b/script/ebshell
index c4fb5d8..b47e379 100755
--- a/script/ebshell
+++ b/script/ebshell
@@ -30,7 +30,7 @@ if ( -s File::Spec->catfile( $lib, "EekBoek.pm" ) ) {
check_install( "EekBoek", "EekBoek.pm", "EB.pm", "EB/schema/eekboek.sql" );
require EekBoek;
-check_version( "EekBoek", $EekBoek::VERSION, "2.00.03" );
+check_version( "EekBoek", $EekBoek::VERSION, "2.00.04" );
require EB::Main;
EB::Main->run;
diff --git a/script/ebwxshell b/script/ebwxshell
index 44262c3..49cc98f 100755
--- a/script/ebwxshell
+++ b/script/ebwxshell
@@ -30,7 +30,7 @@ if ( -s File::Spec->catfile( $lib, "EekBoek.pm" ) ) {
check_install( "EekBoek", "EekBoek.pm", "EB.pm", "EB/schema/eekboek.sql" );
require EekBoek;
-check_version( "EekBoek", $EekBoek::VERSION, "2.00.03" );
+check_version( "EekBoek", $EekBoek::VERSION, "2.00.04" );
check_install( "De EekBoek WxShell", "EB/Wx/Shell/Main.pm", "EB/Wx/IniWiz.pm" );
diff --git a/t/ivp/ref/export.xaf b/t/ivp/ref/export.xaf
index da935d4..dc57b9f 100644
--- a/t/ivp/ref/export.xaf
+++ b/t/ivp/ref/export.xaf
@@ -14,7 +14,7 @@
<currencyCode>EUR</currencyCode>
<dateCreated>2007-12-31</dateCreated>
<productID>EekBoek</productID>
- <productVersion>2.00.03</productVersion>
+ <productVersion>2.00.04</productVersion>
</header>
<generalLedger>
<taxonomy>geen</taxonomy>
--
Debian packaging of eekboek
More information about the Pkg-perl-cvs-commits
mailing list