r49011 - in /trunk/eekboek: ./ debian/ lib/ lib/EB/ lib/EB/CPAN/Wx/ lib/EB/DB/ lib/EB/Tools/ lib/EB/Wx/ lib/EB/Wx/Booking/ lib/EB/Wx/Export/ lib/EB/Wx/Maint/ lib/EB/Wx/Report/ lib/EB/Wx/Shell/ lib/EB/Wx/Tools/ lib/EB/Wx/UI/ lib/EB/Wx/icons/ lib/EB/migrate/ lib/EB/mo/ lib/EB/schema/ script/ t/ivp/ref/

joostvb at users.alioth.debian.org joostvb at users.alioth.debian.org
Sun Dec 20 09:22:31 UTC 2009


Author: joostvb
Date: Sun Dec 20 09:22:25 2009
New Revision: 49011

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=49011
Log:
new upstream, starting next .deb release

Added:
    trunk/eekboek/lib/EB/CPAN/Wx/
      - copied from r49010, branches/upstream/eekboek/current/lib/EB/CPAN/Wx/
    trunk/eekboek/lib/EB/IniWiz.pm
      - copied unchanged from r49010, branches/upstream/eekboek/current/lib/EB/IniWiz.pm
    trunk/eekboek/lib/EB/Wx/Shell/
      - copied from r49010, branches/upstream/eekboek/current/lib/EB/Wx/Shell/
    trunk/eekboek/lib/EB/mo/
      - copied from r49010, branches/upstream/eekboek/current/lib/EB/mo/
    trunk/eekboek/lib/EB/schema/eenmanszaak.ebz
      - copied unchanged from r49010, branches/upstream/eekboek/current/lib/EB/schema/eenmanszaak.ebz
    trunk/eekboek/lib/EB/schema/nvbv.ebz
      - copied unchanged from r49010, branches/upstream/eekboek/current/lib/EB/schema/nvbv.ebz
    trunk/eekboek/lib/EB/schema/ondernemer.ebz
      - copied unchanged from r49010, branches/upstream/eekboek/current/lib/EB/schema/ondernemer.ebz
    trunk/eekboek/lib/EB/schema/vereniging.ebz
      - copied unchanged from r49010, branches/upstream/eekboek/current/lib/EB/schema/vereniging.ebz
    trunk/eekboek/script/ebwxshell
      - copied unchanged from r49010, branches/upstream/eekboek/current/script/ebwxshell
Removed:
    trunk/eekboek/lib/EB/Wx/Booking/
    trunk/eekboek/lib/EB/Wx/Export/
    trunk/eekboek/lib/EB/Wx/Main.pm
    trunk/eekboek/lib/EB/Wx/MainFrame.pm
    trunk/eekboek/lib/EB/Wx/Maint/
    trunk/eekboek/lib/EB/Wx/Report/
    trunk/eekboek/lib/EB/Wx/State.pm
    trunk/eekboek/lib/EB/Wx/Tools/
    trunk/eekboek/lib/EB/Wx/UI/
    trunk/eekboek/lib/EB/Wx/Window.pm
    trunk/eekboek/lib/EB/Wx/icons/calendar.png
    trunk/eekboek/lib/EB/Wx/icons/credit.png
    trunk/eekboek/lib/EB/Wx/icons/debet.png
    trunk/eekboek/lib/EB/Wx/icons/eb.jpg
    trunk/eekboek/lib/EB/Wx/icons/ebicon.png
    trunk/eekboek/lib/EB/Wx/icons/ebsplash.jpg
    trunk/eekboek/lib/EB/Wx/icons/edit_add.png
    trunk/eekboek/lib/EB/Wx/icons/edit_remove.png
    trunk/eekboek/lib/EB/Wx/icons/edittrash.png
    trunk/eekboek/lib/EB/Wx/icons/perl_powered.png
    trunk/eekboek/lib/EB/Wx/tips.txt
Modified:
    trunk/eekboek/CHANGES
    trunk/eekboek/EekBoek.spec
    trunk/eekboek/MANIFEST
    trunk/eekboek/META.yml
    trunk/eekboek/debian/changelog
    trunk/eekboek/lib/EB/Config.pm
    trunk/eekboek/lib/EB/DB/Sqlite.pm
    trunk/eekboek/lib/EB/Main.pm
    trunk/eekboek/lib/EB/Tools/Einde.pm
    trunk/eekboek/lib/EB/Wx/IniWiz.pm
    trunk/eekboek/lib/EB/migrate/001000013001000014.sql
    trunk/eekboek/lib/EB/schema/sample.conf
    trunk/eekboek/lib/EekBoek.pm
    trunk/eekboek/script/ebgui
    trunk/eekboek/t/ivp/ref/export.xaf

Modified: trunk/eekboek/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/CHANGES?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/CHANGES (original)
+++ trunk/eekboek/CHANGES Sun Dec 20 09:22:25 2009
@@ -1,6 +1,36 @@
 # CHANGES		-*- coding: utf-8 -*-
 
-1.05.03
+1.05.05
+
+	* Integratie met EB WxShell.
+
+	* Verwijder (tijdelijk) GUI voor ombouw tot browser.
+
+	* (Wizard) Config 'admdir' in sectie '[general]' kan worden
+          gebruikt om te bepalen waar de administraties (moeten komen
+          te) staan.
+
+	* (Wizard) Voorkom dat de verkeerde ebshell wordt opgestart.
+
+	* (Wizard) Gebruik de voorbeeldadministratie als default.
+
+	* Bugfix (regressie) BTW werd niet afgeboekt in de volgjaren
+	  van een meerjarige boekhouding.
+
+	* Bugfix: meervoudige definitie van 'min' in
+          EB/Tools/Einde.pm.
+
+	* Bugfix: ebgui kende --[no]wizard niet.
+
+	* (Wizard): Defaults voor adm code en database naam.
+
+1.05.04	2009-10-28 23:47
+
+	* Many internal changes for GUI integration.
+
+	* Consistent gedrag gui/wizard.
+
+1.05.03	2009-10-27 16:15
 
 	* !!! SNAPSHOT !!! SNAPSHOT !!! SNAPSHOT !!!
 

Modified: trunk/eekboek/EekBoek.spec
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/EekBoek.spec?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/EekBoek.spec (original)
+++ trunk/eekboek/EekBoek.spec Sun Dec 20 09:22:25 2009
@@ -14,7 +14,7 @@
 Summary: Bookkeeping software for small and medium-size businesses
 License: GPL+ or Artistic
 Group: Applications/Productivity
-Version: 1.05.04
+Version: 1.05.05
 Release: 1%{?dist}
 Source: http://www.eekboek.nl/dl/%{name}-%{version}.tar.gz
 URL: http://www.eekboek.nl

Modified: trunk/eekboek/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/MANIFEST?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/MANIFEST (original)
+++ trunk/eekboek/MANIFEST Sun Dec 20 09:22:25 2009
@@ -117,6 +117,7 @@
 lib/EB/CPAN/File/HomeDir/MacOS9.pm
 lib/EB/CPAN/File/HomeDir/Unix.pm
 lib/EB/CPAN/File/HomeDir/Windows.pm
+lib/EB/CPAN/Wx/Perl/ProcessStream.pm
 lib/EB/Config.pm
 lib/EB/Config/Data.pm
 lib/EB/DB.pm
@@ -127,6 +128,7 @@
 lib/EB/Format.pm
 lib/EB/Globals.pm
 lib/EB/Import.pm
+lib/EB/IniWiz.pm
 lib/EB/Locale.pm
 lib/EB/Main.pm
 lib/EB/Relation.pm
@@ -160,64 +162,15 @@
 lib/EB/Tools/SQLEngine.pm
 lib/EB/Tools/Schema.pm
 lib/EB/Utils.pm
-lib/EB/Wx/Booking/BKMPanel.pm
-lib/EB/Wx/Booking/IVPanel.pm
-lib/EB/Wx/Booking/IVPanel/BskPanel.pm
-lib/EB/Wx/Booking/IVPanel/BsrPanel.pm
-lib/EB/Wx/Export/EekBoek.pm
-lib/EB/Wx/Export/XAF.pm
 lib/EB/Wx/FakeApp.pm
 lib/EB/Wx/IniWiz.pm
 lib/EB/Wx/IniWiz/OpenDialog.pm
 lib/EB/Wx/Locale.pm
-lib/EB/Wx/Main.pm
-lib/EB/Wx/MainFrame.pm
-lib/EB/Wx/Maint/Accounts.pm
-lib/EB/Wx/Maint/Accounts/TreeCtrl.pm
-lib/EB/Wx/Maint/BTWTarieven.pm
-lib/EB/Wx/Maint/Dagboeken.pm
-lib/EB/Wx/Maint/Relaties.pm
-lib/EB/Wx/Maint/StdAccounts.pm
-lib/EB/Wx/Report/BTWAangifte.pm
-lib/EB/Wx/Report/BTWAangifte/Preferences.pm
-lib/EB/Wx/Report/BalResProof.pm
-lib/EB/Wx/Report/DebCrd.pm
-lib/EB/Wx/Report/DebCrd/Preferences.pm
-lib/EB/Wx/Report/GenBase.pm
-lib/EB/Wx/Report/GenBase/Preferences.pm
-lib/EB/Wx/Report/Grootboek.pm
-lib/EB/Wx/Report/Grootboek/Preferences.pm
-lib/EB/Wx/Report/Journaal.pm
-lib/EB/Wx/Report/Journaal/Preferences.pm
-lib/EB/Wx/Report/Openstaand.pm
-lib/EB/Wx/State.pm
-lib/EB/Wx/Tools/AboutDialog.pm
-lib/EB/Wx/Tools/PreferencesDialog.pm
-lib/EB/Wx/Tools/PropertiesDialog.pm
-lib/EB/Wx/UI/AccInput.pm
-lib/EB/Wx/UI/AmountCtrl.pm
-lib/EB/Wx/UI/BalAccInput.pm
-lib/EB/Wx/UI/BTWInput.pm
-lib/EB/Wx/UI/HvdInput.pm
-lib/EB/Wx/UI/ListInput.pm
-lib/EB/Wx/UI/ListInput/ListDialog.pm
-lib/EB/Wx/UI/NumericCtrl.pm
-lib/EB/Wx/UI/PeriodPanel.pm
-lib/EB/Wx/UI/StdAccPanel.pm
-lib/EB/Wx/UI/VdiInput.pm
-lib/EB/Wx/Window.pm
-lib/EB/Wx/icons/calendar.png
-lib/EB/Wx/icons/credit.png
-lib/EB/Wx/icons/debet.png
-lib/EB/Wx/icons/eb.jpg
-lib/EB/Wx/icons/ebicon.png
+lib/EB/Wx/Shell/HtmlViewer.pm
+lib/EB/Wx/Shell/Main.pm
+lib/EB/Wx/Shell/MainFrame.pm
+lib/EB/Wx/Shell/PreferencesDialog.pm
 lib/EB/Wx/icons/ebwiz.jpg
-lib/EB/Wx/icons/ebsplash.jpg
-lib/EB/Wx/icons/edit_add.png
-lib/EB/Wx/icons/edit_remove.png
-lib/EB/Wx/icons/edittrash.png
-lib/EB/Wx/icons/perl_powered.png
-lib/EB/Wx/tips.txt
 lib/EB/css/balans.css
 lib/EB/css/balres.css
 lib/EB/css/btwaangifte.css
@@ -248,12 +201,18 @@
 lib/EB/migrate/001000011001000012.sql
 lib/EB/migrate/001000012001000013.sql
 lib/EB/migrate/001000013001000014.sql
+lib/EB/mo/nl/ebwxshell.mo
 lib/EB/schema/eekboek.sql
+lib/EB/schema/eenmanszaak.ebz
+lib/EB/schema/nvbv.ebz
+lib/EB/schema/ondernemer.ebz
 lib/EB/schema/sampledb.ebz
+lib/EB/schema/vereniging.ebz
 lib/EB/schema/sample.conf
 lib/EekBoek.pm
 script/ebshell
 script/ebgui
+script/ebwxshell
 t/10_basic.t
 t/20_dates.t
 t/30_amounts.t

Modified: trunk/eekboek/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/META.yml?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/META.yml (original)
+++ trunk/eekboek/META.yml Sun Dec 20 09:22:25 2009
@@ -1,6 +1,6 @@
 ---
 name: EekBoek
-version: 1.05.04
+version: 1.05.05
 author:
   - Johan Vromans (jvromans at squirrel.nl)
 abstract: Elementary Bookkeeping (for the Dutch/European market)
@@ -26,7 +26,7 @@
 provides:
   EekBoek:
     file: lib/EekBoek.pm
-    version: 1.05.04
+    version: 1.05.05
 generated_by: Module::Build version 0.28
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.2.html

Modified: trunk/eekboek/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/debian/changelog?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/debian/changelog (original)
+++ trunk/eekboek/debian/changelog Sun Dec 20 09:22:25 2009
@@ -1,8 +1,12 @@
-eekboek (1.05.04-5) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Joost van Baal <joostvb at debian.org>  Fri, 18 Dec 2009 05:49:40 +0100
+eekboek (1.05.05-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+  [ Joost van Baal ]
+  * lib/EB/DB/Sqlite.pm: replace our patch with fixed upstream
+    version.
+
+ -- Joost van Baal <joostvb at debian.org>  Sun, 20 Dec 2009 10:18:42 +0100
 
 eekboek (1.05.04-4) experimental; urgency=low
 

Modified: trunk/eekboek/lib/EB/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/Config.pm?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/Config.pm (original)
+++ trunk/eekboek/lib/EB/Config.pm Sun Dec 20 09:22:25 2009
@@ -3,7 +3,7 @@
 use utf8;
 
 # Config.pm -- Configuration files.
-# RCS Info        : $Id: Config.pm,v 1.24 2009/10/28 22:08:50 jv Exp $
+# RCS Info        : $Id: Config.pm,v 1.25 2009/12/15 13:39:17 jv Exp $
 # Author          : Johan Vromans
 # Created On      : Fri Jan 20 17:57:13 2006
 # Last Modified By: Johan Vromans

Modified: trunk/eekboek/lib/EB/DB/Sqlite.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/DB/Sqlite.pm?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/DB/Sqlite.pm (original)
+++ trunk/eekboek/lib/EB/DB/Sqlite.pm Sun Dec 20 09:22:25 2009
@@ -1,12 +1,12 @@
 #! perl
 
 # Sqlite.pm -- EekBoek driver for SQLite database
-# RCS Info        : $Id: Sqlite.pm,v 1.10 2009/10/16 18:22:19 jv Exp $
+# RCS Info        : $Id: Sqlite.pm,v 1.11 2009/12/18 21:56:03 jv Exp $
 # Author          : Johan Vromans
 # Created On      : Sat Oct  7 10:10:36 2006
 # Last Modified By: Johan Vromans
-# Last Modified On: Fri Oct 16 12:30:30 2009
-# Update Count    : 157
+# Last Modified On: Fri Dec 18 20:07:56 2009
+# Update Count    : 158
 # Status          : Unknown, Use with caution!
 
 package main;
@@ -18,7 +18,7 @@
 use strict;
 use warnings;
 
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.10 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.11 $ =~ /(\d+)/g;
 
 use EB;
 use DBI;
@@ -105,7 +105,12 @@
     }
 
     # Our database is UTF8, so deal with it properly.
-    $dbh->{sqlite_unicode} = 1;
+    if ( $DBD::SQLite::VERSION ge "1.26_06" ) {
+	$dbh->{sqlite_unicode} = 1;
+    }
+    else {
+	$dbh->{unicode} = 1;
+    }
 
     # Create some missing functions.
     register_functions();

Modified: trunk/eekboek/lib/EB/Main.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/Main.pm?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/Main.pm (original)
+++ trunk/eekboek/lib/EB/Main.pm Sun Dec 20 09:22:25 2009
@@ -2,12 +2,12 @@
 
 use utf8;
 
-# RCS Id          : $Id: Main.pm,v 1.8 2009/10/28 22:09:45 jv Exp $
+# RCS Id          : $Id: Main.pm,v 1.9 2009/12/15 13:41:14 jv Exp $
 # Author          : Johan Vromans
 # Created On      : Thu Jul  7 15:53:48 2005
 # Last Modified By: Johan Vromans
-# Last Modified On: Wed Oct 28 23:36:39 2009
-# Update Count    : 969
+# Last Modified On: Sat Dec 19 15:23:25 2009
+# Update Count    : 975
 # Status          : Unknown, Use with caution!
 
 ################ Common stuff ################
@@ -80,6 +80,18 @@
 
     my $userdir = $cfg->user_dir;
     mkdir($userdir) unless -d $userdir;
+
+    if ( $opts->{wizard}
+	 or
+	 !$opts->{config}
+	 && ( -e ".eekboek.conf" ? $cfg->val( qw(general wizard), 0 ) : 1 )
+       ) {
+	require EB::IniWiz;
+	EB::IniWiz->run($opts); # sets $opts->{runeb}
+	return unless $opts->{runeb};
+	undef $cfg;
+	EB::Config->init_config( { app => $EekBoek::PACKAGE, %$opts } );
+    }
 
     if ( $opts->{createsampleconfig} ) {
 	$opts->{command} = 1;
@@ -243,6 +255,7 @@
 		      'dir=s',
 		      'file=s',
 		      'interactive!',
+		      'wizard',
 		      'errexit',
 		      'trace',
 		      'help|?' => $help,

Modified: trunk/eekboek/lib/EB/Tools/Einde.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/Tools/Einde.pm?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/Tools/Einde.pm (original)
+++ trunk/eekboek/lib/EB/Tools/Einde.pm Sun Dec 20 09:22:25 2009
@@ -3,12 +3,12 @@
 use utf8;
 
 # Einde.pm -- Eindejaarsverwerking
-# RCS Info        : $Id: Einde.pm,v 1.20 2009/10/17 22:02:54 jv Exp $
+# RCS Info        : $Id: Einde.pm,v 1.22 2009/11/04 22:24:03 jv Exp $
 # Author          : Johan Vromans
 # Created On      : Sun Oct 16 21:27:40 2005
 # Last Modified By: Johan Vromans
-# Last Modified On: Sat Oct 17 12:50:26 2009
-# Update Count    : 241
+# Last Modified On: Wed Nov  4 23:21:55 2009
+# Update Count    : 246
 # Status          : Unknown, Use with caution!
 
 package main;
@@ -21,7 +21,7 @@
 use strict;
 use warnings;
 
-our $VERSION = sprintf "%d.%03d", q$Revision: 1.20 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%03d", q$Revision: 1.22 $ =~ /(\d+)/g;
 
 use EB;
 use EB::Format;
@@ -35,8 +35,6 @@
     $class = ref($class) || $class;
     return bless {} => $class;
 }
-
-sub min($$) { $_[0] lt $_[1] ? $_[0] : $_[1] }
 
 sub perform {
     my ($self, $args, $opts) = @_;
@@ -176,7 +174,8 @@
 
       ## Afboeken BTW
 
-      foreach my $stdacc ( @{ $dbh->std_accs } ) {
+      foreach ( @{ $dbh->std_accs } ) {
+	my $stdacc = $_;	# copy for mod
 	next unless $stdacc =~ /^btw_[iv].$/;
 	next unless defined( $stdacc = $dbh->std_acc($stdacc, undef) );
 	($acc_id, $acc_desc, $acc_balance) =

Modified: trunk/eekboek/lib/EB/Wx/IniWiz.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/Wx/IniWiz.pm?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/Wx/IniWiz.pm (original)
+++ trunk/eekboek/lib/EB/Wx/IniWiz.pm Sun Dec 20 09:22:25 2009
@@ -10,7 +10,6 @@
 use EekBoek;
 use EB;
 use EB::Tools::MiniAdm;
-use EB::Wx::Main;
 use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 
 our $app;
@@ -99,6 +98,9 @@
 
 # end wxGlade
 
+	# Set defaults for code and db name.
+	OnSelectAdmName( $self->{wiz} );
+
 	my $prev;
 	for ( my $i = 0; ; $i++ ) {
 	    my $page = sprintf("wiz_p%02d", $i);
@@ -111,6 +113,7 @@
 
 	@ebz = glob( libfile("schema/*.ebz") );
 
+	my $i = 0;
 	foreach my $ebz ( @ebz ) {
 	    require Archive::Zip;
 	    my $zip = Archive::Zip->new();
@@ -126,12 +129,15 @@
 		$desc = $1 if $ebz =~ m/([^\\\/]+)\.ebz$/i;
 	    }
 	    $self->{ch_template}->Append($desc);
+	    $i++;
+	    if ( $ebz =~ /\/sample(db)?\.ebz$/ ) {
+		$self->{ch_template}->SetSelection($i);
+	    }
 	}
 	unshift (@ebz, undef );	# skeleton
 
 	# Enumerate DB drivers.
 	my $drivers = find_db_drivers();
-	my $def = 0;
 	$self->{ch_db_driver}->Delete(0) while $self->{ch_db_driver}->GetCount;
 	foreach ( sort keys %$drivers ) {
 	    push( @db_drivers, $_ );
@@ -175,8 +181,19 @@
     my ( $pkg, $opts ) = @_;
     chdir($opts->{admdir});
     my @files = glob( "*/" . $cfg->std_config );
+    my @adm_desc;
     foreach ( sort @files ) {
 	push( @adm_dirs, dirname($_) );
+	my $desc = $adm_dirs[-1];
+	if ( open( my $fd, '<:utf8', $adm_dirs[-1]."/opening.eb" ) ) {
+	    while ( <$fd> ) {
+		next unless /adm_naam\s+"(.+)"/;
+		$desc = $1;
+		last;
+	    }
+	    close($fd);
+	}
+	push( @adm_desc, $desc);
     }
 
     my $ret = wxID_NEW;
@@ -185,7 +202,7 @@
 	my $d = EB::Wx::IniWiz::OpenDialog->new( undef, -1,
 						 _T("Kies"),
 						 wxDefaultPosition, wxDefaultSize, );
-	$d->init( \@adm_dirs );
+	$d->init( \@adm_desc );
 	if ( ($ret = $d->ShowModal) == wxID_OK ) {
 	    chdir( $adm_dirs[ $d->GetSelection ] ) || die("chdir");
 	}
@@ -498,7 +515,7 @@
 		    # Using EB::Main->run crashes ...
 		    # Need to run ebshell externally.
 
-		    my @cmd = ( "ebshell", "--init" );	
+		    my @cmd = ( $^X, "-S", "ebshell", "--init" );
 		    my $ret = system(@cmd);
 		    $self->{t_main}->AppendText(_T( $ret ? "Mislukt" : "Gereed")."\n");
 		}
@@ -594,14 +611,14 @@
 
 sub run {
     my ( $self, $opts ) = @_;
-    my $admdir = $opts->{admdir} ||= $cfg->user_dir("admdir");
+    my $admdir = $opts->{admdir} || $cfg->val(qw(general admdir), $cfg->user_dir("admdir"));
     $runeb = 1;
-
+    $admdir =~ s/\$([A-Z_]+)/$ENV{$1}/ge;
     if ( $admdir ) {
 	mkdir($admdir) unless -d $admdir;
 	die("No admdir $admdir: $!") unless -d $admdir;
     }
-
+    $opts->{admdir} = $admdir;
     $runeb = 0;
 
     no warnings 'redefine';

Modified: trunk/eekboek/lib/EB/migrate/001000013001000014.sql
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/migrate/001000013001000014.sql?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/migrate/001000013001000014.sql (original)
+++ trunk/eekboek/lib/EB/migrate/001000013001000014.sql Sun Dec 20 09:22:25 2009
@@ -1,6 +1,11 @@
 BEGIN WORK;
 
+SELECT * INTO TEMP TAccounts FROM Accounts WHERE acc_id = 0;
+
 ALTER TABLE Accounts
+ADD COLUMN acc_dcfixed      boolean;	-- fixed d/c
+
+ALTER TABLE TAccounts
 ADD COLUMN acc_dcfixed      boolean;	-- fixed d/c
 
 UPDATE Accounts SET acc_dcfixed = 'f' WHERE acc_balres;

Modified: trunk/eekboek/lib/EB/schema/sample.conf
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EB/schema/sample.conf?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/lib/EB/schema/sample.conf (original)
+++ trunk/eekboek/lib/EB/schema/sample.conf Sun Dec 20 09:22:25 2009
@@ -33,7 +33,11 @@
 
 [general]
 
-; There are currently no General config variables.
+; Default location for administrations.
+;admdir = $HOME/.eekboek/admdir
+
+; Force use of selection wizard even if a config is present.
+;wizard = 1
 
 [locale]
 

Modified: trunk/eekboek/lib/EekBoek.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/lib/EekBoek.pm?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/lib/EekBoek.pm (original)
+++ trunk/eekboek/lib/EekBoek.pm Sun Dec 20 09:22:25 2009
@@ -10,9 +10,9 @@
 # Minimal version to prevent many Unicode bugs.
 use 5.008003;
 
-my $RCS_Id = '$Id: EekBoek.pm,v 1.79 2009/10/27 15:22:39 jv Exp $ ';
+my $RCS_Id = '$Id: EekBoek.pm,v 1.80 2009/10/28 22:55:29 jv Exp $ ';
 our $PACKAGE = 'EekBoek';
-our $VERSION = '1.05.04';
+our $VERSION = '1.05.05';
 
 =head1 NAME
 
@@ -63,4 +63,4 @@
 
 1;
 
-# $Id: EekBoek.pm,v 1.79 2009/10/27 15:22:39 jv Exp $ 
+# $Id: EekBoek.pm,v 1.80 2009/10/28 22:55:29 jv Exp $ 

Modified: trunk/eekboek/script/ebgui
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/script/ebgui?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/script/ebgui (original)
+++ trunk/eekboek/script/ebgui Sun Dec 20 09:22:25 2009
@@ -1,6 +1,6 @@
 #! perl
 
-# $Id: ebgui,v 1.10 2009/10/28 22:11:46 jv Exp $
+# $Id: ebgui,v 1.11 2009/11/25 09:41:53 jv Exp $
 
 use strict;
 use utf8;
@@ -67,6 +67,7 @@
 
 sub check_version {
     my ( $what, $version, $required ) = @_;
+    $version =~ s/,/./g;
     return if $version ge $required;
     error( <<END_MSG, "Ontoereikende $what versie" );
 De geïnstalleerde versie van $what is niet toereikend.

Modified: trunk/eekboek/t/ivp/ref/export.xaf
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/eekboek/t/ivp/ref/export.xaf?rev=49011&op=diff
==============================================================================
--- trunk/eekboek/t/ivp/ref/export.xaf (original)
+++ trunk/eekboek/t/ivp/ref/export.xaf Sun Dec 20 09:22:25 2009
@@ -14,7 +14,7 @@
     <currencyCode>EUR</currencyCode>
     <dateCreated>2007-12-31</dateCreated>
     <productID>EekBoek</productID>
-    <productVersion>1.05.04</productVersion>
+    <productVersion>1.05.05</productVersion>
   </header>
   <generalLedger>
     <taxonomy>geen</taxonomy>




More information about the Pkg-perl-cvs-commits mailing list