r24144 - in /branches/upstream/eekboek/current: CHANGES EekBoek.spec META.yml lib/EB/Export/XAF.pm lib/EB/Report/BTWAangifte.pm lib/EB/Report/Reporter.pm lib/EB/Shell.pm lib/EekBoek.pm
joostvb at users.alioth.debian.org
joostvb at users.alioth.debian.org
Mon Aug 11 18:08:06 UTC 2008
Author: joostvb
Date: Mon Aug 11 18:08:04 2008
New Revision: 24144
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=24144
Log:
[svn-upgrade] Integrating new upstream version, eekboek (1.03.92)
Modified:
branches/upstream/eekboek/current/CHANGES
branches/upstream/eekboek/current/EekBoek.spec
branches/upstream/eekboek/current/META.yml
branches/upstream/eekboek/current/lib/EB/Export/XAF.pm
branches/upstream/eekboek/current/lib/EB/Report/BTWAangifte.pm
branches/upstream/eekboek/current/lib/EB/Report/Reporter.pm
branches/upstream/eekboek/current/lib/EB/Shell.pm
branches/upstream/eekboek/current/lib/EekBoek.pm
Modified: branches/upstream/eekboek/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/CHANGES?rev=24144&op=diff
==============================================================================
--- branches/upstream/eekboek/current/CHANGES (original)
+++ branches/upstream/eekboek/current/CHANGES Mon Aug 11 18:08:04 2008
@@ -1,4 +1,15 @@
-1.03.90
+1.03.92
+
+ * Kleine verbeteringen XAF export.
+ Fix --boekjaar voor --xaf export.
+
+ * Verwijder --boekjaar optie voor gewone export.
+
+1.03.91 2008-08-02 15:06 (CPAN only)
+
+ * Bugfix headerinderdrukking van de BTW-aangifte.
+
+1.03.90 2008-07-19 18:58
* Alle rapporten in HTML kunnen een expliciete titel
meekrijgen:
Modified: branches/upstream/eekboek/current/EekBoek.spec
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/EekBoek.spec?rev=24144&op=diff
==============================================================================
--- branches/upstream/eekboek/current/EekBoek.spec (original)
+++ branches/upstream/eekboek/current/EekBoek.spec Mon Aug 11 18:08:04 2008
@@ -5,7 +5,7 @@
# Package name, lowcase (eekboek)
%define lcname eekboek
# Package version
-%define pkgversion 1.03.90
+%define pkgversion 1.03.92
# Suffix (-unstable, or empty)
%define pkgsuffix -unstable
Modified: branches/upstream/eekboek/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/META.yml?rev=24144&op=diff
==============================================================================
--- branches/upstream/eekboek/current/META.yml (original)
+++ branches/upstream/eekboek/current/META.yml Mon Aug 11 18:08:04 2008
@@ -1,6 +1,6 @@
---
name: EekBoek
-version: 1.03.90
+version: 1.03.92
author:
- Johan Vromans (jvromans at squirrel.nl)
abstract: Elementary Bookkeeping (for the Dutch/European market)
@@ -68,7 +68,7 @@
version: 1.029
EB::Export::XAF:
file: lib/EB/Export/XAF.pm
- version: 1.001
+ version: 1.002
EB::Expression:
file: lib/EB/Expression.pm
EB::Format:
@@ -94,7 +94,7 @@
version: 1.007
EB::Report::BTWAangifte:
file: lib/EB/Report/BTWAangifte.pm
- version: 1.047
+ version: 1.048
EB::Report::BTWAangifte::Csv:
file: lib/EB/Report/BTWAangifte.pm
EB::Report::BTWAangifte::Html:
@@ -179,7 +179,7 @@
version: 1.003
EB::Report::Reporter:
file: lib/EB/Report/Reporter.pm
- version: 1.014
+ version: 1.016
EB::Report::Reporter::Csv:
file: lib/EB/Report/Reporter/Csv.pm
version: 1.006
@@ -194,7 +194,7 @@
version: 1.008
EB::Shell:
file: lib/EB/Shell.pm
- version: 1.107
+ version: 1.109
EB::Shell::Base:
file: lib/EB/Shell/Base.pm
version: 1.021
@@ -221,7 +221,7 @@
version: 1.008
EekBoek:
file: lib/EekBoek.pm
- version: 1.03.90
+ version: 1.03.92
generated_by: Module::Build version 0.28
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.2.html
Modified: branches/upstream/eekboek/current/lib/EB/Export/XAF.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Export/XAF.pm?rev=24144&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Export/XAF.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Export/XAF.pm Mon Aug 11 18:08:04 2008
@@ -4,8 +4,8 @@
# Author : Johan Vromans
# Created On : Sun Apr 13 17:25:07 2008
# Last Modified By: Johan Vromans
-# Last Modified On: Mon Apr 14 16:32:52 2008
-# Update Count : 232
+# Last Modified On: Sun Aug 3 21:36:58 2008
+# Update Count : 235
# Status : Unknown, Use with caution!
################ Common stuff ################
@@ -20,7 +20,7 @@
use strict;
use warnings;
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.1 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.2 $ =~ /(\d+)/g;
use EB;
use EB::Format;
@@ -41,7 +41,7 @@
$self->{fh} = $xaf;
# Default to current boekjaar.
- $self->{bky} = $opts->{bky} || $dbh->adm("bky");
+ $self->{bky} = $opts->{boekjaar} || $dbh->adm("bky");
$self->{indent} = 0;
$self->{openingdata} = [];
@@ -269,7 +269,7 @@
" AND jnl_bsk_id = bsk_id".
" AND jnl_date >= ?".
" AND jnl_date <= ?".
- " ORDER BY jnl_date, jnl_bsk_id, jnl_bsr_seq",
+ " ORDER BY bsk_nr, jnl_date, jnl_bsk_id, jnl_bsr_seq",
$dbk->[0], $self->{begin}, $self->{end});
$sth->bind_columns
Modified: branches/upstream/eekboek/current/lib/EB/Report/BTWAangifte.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Report/BTWAangifte.pm?rev=24144&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Report/BTWAangifte.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Report/BTWAangifte.pm Mon Aug 11 18:08:04 2008
@@ -1,11 +1,11 @@
#! perl
-# RCS Id : $Id: BTWAangifte.pm,v 1.47 2008/04/13 13:06:31 jv Exp $
+# RCS Id : $Id: BTWAangifte.pm,v 1.48 2008/07/21 14:56:06 jv Exp $
# Author : Johan Vromans
# Created On : Tue Jul 19 19:01:33 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Sun Apr 13 15:06:03 2008
-# Update Count : 633
+# Last Modified On: Mon Jul 21 16:07:15 2008
+# Update Count : 637
# Status : Unknown, Use with caution!
################ Common stuff ################
@@ -20,7 +20,7 @@
use strict;
use warnings;
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.47 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.48 $ =~ /(\d+)/g;
use EB;
use EB::Format;
@@ -777,30 +777,36 @@
# officiële documentatie spreeekt over "Als de afdracht van
# omzetbelasting beneden de 1.345 per jaar blijft, ...".
- my %mmtab = ( 2002 => [ 1345, 1883 ],
- 2003 => [ 1345, 1883 ],
- 2004 => [ 1345, 1883 ],
- 2005 => [ 1345, 1883 ],
- 2006 => [ 1345, 1883 ],
- 2007 => [ 1345, 1883 ],
- );
-
- $mmtab{$year} ||= [ 1345, 1883 ] if $year >= 2002;
-
- return unless exists $mmtab{$year};
-
- my ($min, $max) = @{$mmtab{$year}};
+ # Code change: beschouw de huidige bedragen als vaststaand.
+
+ return if $year < 2002;
+
+ # my %mmtab = ( 2002 => [ 1345, 1883 ],
+ # 2003 => [ 1345, 1883 ],
+ # 2004 => [ 1345, 1883 ],
+ # 2005 => [ 1345, 1883 ],
+ # 2006 => [ 1345, 1883 ],
+ # 2007 => [ 1345, 1883 ],
+ # );
+ #
+ # $mmtab{$year} ||= [ 1345, 1883 ] if $year >= 2002;
+ #
+ # return unless exists $mmtab{$year};
+ #
+ # my ($min, $max) = @{$mmtab{$year}};
+
+ my ($min, $max) = ( 1345, 1883 );
+
if ( $noround ) {
$min *= AMTSCALE;
$max *= AMTSCALE;
}
- if ( $amount <= $min ) {
- return $amount;
- }
- elsif ( $amount > $min && $amount <= $max ) {
- return roundup(250 * ($max - $amount)) / ($noround ? AMTSCALE : 1);
- }
- return 0;
+
+ return $amount if $amount <= $min;
+ return 0 if $amount > $max;
+
+ my $kko = ($min / ($max - $min)) * ($max - $amount);
+ return $noround ? $kko : roundup($kko*AMTSCALE);
}
sub warnings {
Modified: branches/upstream/eekboek/current/lib/EB/Report/Reporter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Report/Reporter.pm?rev=24144&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Report/Reporter.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Report/Reporter.pm Mon Aug 11 18:08:04 2008
@@ -1,12 +1,12 @@
#! perl
# Reporter.pm --
-# RCS Info : $Id: Reporter.pm,v 1.14 2008/04/09 21:02:06 jv Exp $
+# RCS Info : $Id: Reporter.pm,v 1.16 2008/08/02 13:06:12 jv Exp $
# Author : Johan Vromans
# Created On : Wed Dec 28 13:18:40 2005
# Last Modified By: Johan Vromans
-# Last Modified On: Fri Mar 28 17:49:21 2008
-# Update Count : 149
+# Last Modified On: Sat Aug 2 15:05:06 2008
+# Update Count : 151
# Status : Unknown, Use with caution!
package main;
@@ -19,7 +19,7 @@
use strict;
use warnings;
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.14 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.16 $ =~ /(\d+)/g;
use EB;
use EB::Format;
@@ -44,12 +44,11 @@
$self->{_colsep} = $col->{sep} || (" " x $col->{width});
next;
}
- my $a = { name => $col->{name},
- title => $col->{title} || ucfirst(lc(_T($a->{name}))),
- width => $col->{width} || length($a->{title}),
- align => $col->{align} || "<",
- style => $col->{style} || $col->{name},
- };
+ my $a = { name => $col->{name} };
+ $a->{title} = $col->{title} || "";
+ $a->{width} = $col->{width} || length($a->{title});
+ $a->{align} = $col->{align} || "<";
+ $a->{style} = $col->{style} || $col->{name};
$self->{_fdata}->{$a->{name}} = $a;
push(@{$self->{_fields}}, $a);
if ( my $t = $cfg->val("layout $style", $col->{name}."_width", undef) ) {
Modified: branches/upstream/eekboek/current/lib/EB/Shell.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EB/Shell.pm?rev=24144&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EB/Shell.pm (original)
+++ branches/upstream/eekboek/current/lib/EB/Shell.pm Mon Aug 11 18:08:04 2008
@@ -10,7 +10,7 @@
use strict;
use warnings;
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.107 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.109 $ =~ /(\d+)/g;
use EB;
@@ -707,7 +707,7 @@
], $opts)
or goto &_help_btwaangifte;
- if ( lc($args[-1]) eq "definitief" ) {
+ if ( @args && lc($args[-1]) eq "definitief" ) {
$opts->{close} = 1;
pop(@args);
}
@@ -993,6 +993,8 @@
if ( $opts->{xaf} ) {
if ( findlib "Export/XAF.pm" ) {
require EB::Export::XAF;
+ # XAF bevat altijd maar één boekjaar.
+ $opts->{boekjaar} ||= $bky;
EB::Export::XAF->export($opts);
}
else {
@@ -1000,6 +1002,10 @@
}
}
else {
+ if ( $opts->{boekjaar} ) {
+ warn("?"._T("Optie --boekjaar wordt niet ondersteunt door deze export")."\n");
+ return;
+ }
require EB::Export;
EB::Export->export($opts);
}
@@ -1018,12 +1024,11 @@
--file=<bestand> Selecteer uitvoerbestand
--dir=<directory> Selecteer uitvoerdirectory
--xaf=<bestand> Export XML Auditfile Financieel
- --boekjaar=<code> Selecteer boekjaar
+ --boekjaar=<code> Selecteer boekjaar (alleen met --xaf)
Er moet een --file, --dir of een --xaf optie worden opgegeven.
De XAF export exporteert altijd één enkel boekjaar. Voor de andere
-exports wordt zonder --boekjaar selectie de gehele administratie
-geëxporteerd.
+exports wordt altijd de gehele administratie geëxporteerd.
Eventueel bestaande files worden overschreven.
EOS
}
Modified: branches/upstream/eekboek/current/lib/EekBoek.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/eekboek/current/lib/EekBoek.pm?rev=24144&op=diff
==============================================================================
--- branches/upstream/eekboek/current/lib/EekBoek.pm (original)
+++ branches/upstream/eekboek/current/lib/EekBoek.pm Mon Aug 11 18:08:04 2008
@@ -11,7 +11,7 @@
my $RCS_Id = '$Id: EekBoek.pm,v 1.68 2008/07/19 16:48:21 jv Exp $ ';
our $PACKAGE = 'EekBoek';
-our $VERSION = '1.03.90';
+our $VERSION = '1.03.92';
=head1 NAME
More information about the Pkg-perl-cvs-commits
mailing list