Revision 87b445fe
Von Bernd Bleßmann vor mehr als 1 Jahr hinzugefügt
| SL/Controller/CsvImport/ARTransaction.pm | ||
|---|---|---|
| 534 | 534 |
if ( $ar_entry->{object}->{archart} && $ar_entry->{object}->{archart}->isa('SL::DB::Chart') ) {
|
| 535 | 535 |
$ar_entry->{object}->recalculate_amounts; # determine and set amount and netamount for ar
|
| 536 | 536 |
$ar_entry->{object}->create_ar_row(chart => $ar_entry->{object}->{archart});
|
| 537 |
$ar_entry->{info_data}->{amount} = $ar_entry->{object}->amount;
|
|
| 538 |
$ar_entry->{info_data}->{netamount} = $ar_entry->{object}->netamount;
|
|
| 537 |
$ar_entry->{info_data}->{calc_amount} = $ar_entry->{object}->amount_as_number;
|
|
| 538 |
$ar_entry->{info_data}->{calc_netamount} = $ar_entry->{object}->netamount_as_number;
|
|
| 539 | 539 |
} else {
|
| 540 | 540 |
push @{ $entry->{errors} }, $::locale->text("ar_chart isn't a valid chart");
|
| 541 | 541 |
}; |
| ... | ... | |
| 563 | 563 |
if ( $ar_entry->{object} ) {
|
| 564 | 564 |
if ( $ar_entry->{object}->{archart} && $ar_entry->{object}->{archart}->isa('SL::DB::Chart') ) {
|
| 565 | 565 |
$ar_entry->{object}->recalculate_amounts;
|
| 566 |
$ar_entry->{info_data}->{amount} = $ar_entry->{object}->amount;
|
|
| 567 |
$ar_entry->{info_data}->{netamount} = $ar_entry->{object}->netamount;
|
|
| 566 |
$ar_entry->{info_data}->{calc_amount} = $ar_entry->{object}->amount_as_number;
|
|
| 567 |
$ar_entry->{info_data}->{calc_netamount} = $ar_entry->{object}->netamount_as_number;
|
|
| 568 | 568 |
|
| 569 | 569 |
$ar_entry->{object}->create_ar_row(chart => $ar_entry->{object}->{archart});
|
| 570 | 570 |
} else {
|
| t/controllers/csvimport/artransactions.t | ||
|---|---|---|
| 487 | 487 |
$entry = $entries->[0]; |
| 488 | 488 |
$entry->{object}->validate_acc_trans;
|
| 489 | 489 |
is $entry->{object}->duedate->to_kivitendo, '30.04.2016', 'duedate';
|
| 490 |
is $entry->{info_data}->{amount}, '326', "First invoice amount displayed in info data";
|
|
| 491 |
is $entries->[4]->{info_data}->{amount}, '326', "Second invoice amount displayed in info data";
|
|
| 490 |
is $entry->{info_data}->{calc_amount}, '326.00', "First invoice amount displayed in info data";
|
|
| 491 |
is $entries->[4]->{info_data}->{calc_amount}, '326.00', "Second invoice amount displayed in info data";
|
|
| 492 | 492 |
|
| 493 | 493 |
# multiple entries, taxincluded = f |
| 494 | 494 |
$file = \<<EOL; |
Auch abrufbar als: Unified diff
CSV-Import Debitorenbuchungen: Kalkulierte Beträge: richtige Info-Felder nehmen