Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision e9e28dd2

Von Sven Schöling vor mehr als 15 Jahren hinzugefügt

  • ID e9e28dd26de569ab7b721560d84ea8ddb0c1dda1
  • Vorgänger 6a41eac6
  • Nachfolger c9ac7ebd

Partieller revert von 452974ed95bccca90fe3991d46c081e46413b643:

"Revert "Einkaufsrechnung -> Zahlung buchen: sinnlosen Quark gefixt.""

Die ursprüngliche Änderung bleibt erhalten, bis auf eine Zeile, die
Probleme mit der Darstellung von Kontenlisten im Dialogbuchen machte.

Unterschiede anzeigen:

SL/AP.pm
use SL::IO;
use SL::MoreCommon;
use Data::Dumper;
use strict;
sub post_transaction {
......
(split(/--/, $form->{"AP_amount_$i"}))[0];
}
($form->{AP_amounts}{payables}) = split(/--/, $form->{APselected});
($form->{AP}{payables}) = split(/--/, $form->{APselected});
($form->{AP_payables}) = split(/--/, $form->{APselected});
# reverse and parse amounts
for my $i (1 .. $form->{rowcount}) {
......
# get paid account
($form->{AP}{"paid_$i"}) = split(/--/, $form->{"AP_paid_$i"});
($form->{"AP_paid_account_$i"}) = split(/--/, $form->{"AP_paid_$i"});
$form->{"datepaid_$i"} = $form->{transdate}
unless ($form->{"datepaid_$i"});
......
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, project_id, taxkey) | .
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, | .
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|;
@values = ($form->{id}, $form->{AP}{payables}, $amount,
@values = ($form->{id}, $form->{AP_payables}, $amount,
conv_date($form->{"datepaid_$i"}), $project_id,
$form->{AP}{payables});
$form->{AP_payables});
do_query($form, $dbh, $query, @values);
}
$form->{payables} = $amount;
......
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey) | .
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, ?, ?, ?, | .
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|;
@values = ($form->{id}, $form->{AP}{"paid_$i"}, $form->{"paid_$i"},
@values = ($form->{id}, $form->{"AP_paid_account_$i"}, $form->{"paid_$i"},
conv_date($form->{"datepaid_$i"}), $form->{"source_$i"},
$form->{"memo_$i"}, $project_id, $form->{AP}{"paid_$i"});
$form->{"memo_$i"}, $project_id, $form->{"AP_paid_account_$i"});
do_query($form, $dbh, $query, @values);
# add exchange rate difference
......
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, fx_transaction, cleared, project_id, taxkey) | .
qq|VALUES (?, (SELECT id FROM chart WHERE accno = ?), ?, ?, 't', 'f', ?, | .
qq| (SELECT taxkey_id FROM chart WHERE accno = ?))|;
@values = ($form->{id}, $form->{AP}{"paid_$i"}, $amount,
@values = ($form->{id}, $form->{"AP_paid_account_$i"}, $amount,
conv_date($form->{"datepaid_$i"}), $project_id,
$form->{AP}{"paid_$i"});
$form->{"AP_paid_account_$i"});
do_query($form, $dbh, $query, @values);
}
bin/mozilla/ap.pl
my ($debitaccno, $debittaxkey) = split /--/, $form->{AP_amountselected};
my ($taxkey, $NULL) = split /--/, $form->{taxchartselected};
my ($payablesaccno, $payablestaxkey) = split /--/, $form->{APselected};
$form->{AP}{amount_1} = $debitaccno;
$form->{AP}{payables} = $payablesaccno;
# $form->{AP_amount_1} = $debitaccno;
$form->{AP_payables} = $payablesaccno;
$form->{taxkey} = $taxkey;
$form->{storno} = 0;

Auch abrufbar als: Unified diff