===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- pta/pta_import.pl	2020/11/29 14:00:50	1.25
+++ pta/pta_import.pl	2020/11/30 14:38:35	1.26
@@ -33,35 +33,7 @@ my %banks = (
 );
 
 # === SUBROUTINES  =====================================================
-sub get_accounts_by_amount_sign ($$$) {
-	my ($amount, $account, $csv_account) = @_;
-	my ($debit, $credit);
-	if ($amount <= 0) {
-		$amount = substr $amount, 1;
-		$credit = $csv_account;
-		$debit = $account;
-	} else {
-		$debit = $csv_account;
-		$credit = $account;
-	}
-	return ($amount, $debit, $credit);
-}
 
-sub get_accounts_by_csv_col ($$$$) {
-	my ($account, $csv_account, $csv_debit, $csv_credit) = @_;
-	my ($amount, $debit, $credit);
-	if ($csv_debit eq "") {
-		$amount = $csv_credit;
-		$credit = $account;
-		$debit = $csv_account;
-	} else {
-		$amount = $csv_debit;
-		$credit = $csv_account;
-		$debit = $account;
-	}
-	return ($amount, $debit, $credit);
-}
-
 sub usage () {
 	printf STDERR "usage: %s -I accountname csvfilename\n", $0;
 	exit 1;
@@ -206,19 +178,16 @@ LINE: while (<STDIN>) {
 			$fields[$i] = "-$1" if $fields[$i] =~ /^\((\d+\.\d+)\)/;
 		}
 	}
-	my $description = join ' ', @fields[@description_fields];
-	my ($amount, $credit, $debit);
-	if ($#amount_fields) {
-		($amount, $debit, $credit) =
-		    get_accounts_by_csv_col($account,
-		    $csv_account, $fields[$amount_fields[0]],
-		    $fields[$amount_fields[1]]);
-	} else {
-		($amount, $debit, $credit) =
-		    get_accounts_by_amount_sign(
-		        $fields[$amount_fields[0]],
-		        $account, $csv_account);
+	my $debit = $csv_account;
+	my $credit = $account;
+	my $amount = $fields[$amount_fields[-1]] || -$fields[$amount_fields[0]];
+	if ($amount < 0) {
+		$amount *= -1;
+		$credit = $csv_account;
+		$debit = $account;
 	}
+	$amount = sprintf "%.2f", $amount;
+	my $description = join ' ', @fields[@description_fields];
 	$date && $amount && $debit && $credit && $description
 	    or die "import parse error: $line";
 	$description =~ s/#//g;