Revision 3250ebcf
Von Bernd Bleßmann vor fast 11 Jahren hinzugefügt
| SL/Controller/CsvImport/Order.pm | ||
|---|---|---|
| 127 | 127 |
{ name => 'language', description => $::locale->text('Language (name)') },
|
| 128 | 128 |
{ name => 'payment_id', description => $::locale->text('Payment terms (database ID)') },
|
| 129 | 129 |
{ name => 'payment', description => $::locale->text('Payment terms (name)') },
|
| 130 |
{ name => 'taxzone_id', description => $::locale->text('Steuersatz (database ID') },
|
|
| 131 |
{ name => 'taxzone', description => $::locale->text('Steuersatz (description)') },
|
|
| 130 |
{ name => 'taxzone_id', description => $::locale->text('Tax zone (database ID)') },
|
|
| 131 |
{ name => 'taxzone', description => $::locale->text('Tax zone (description)') },
|
|
| 132 | 132 |
{ name => 'cp_id', description => $::locale->text('Contact Person (database ID)') },
|
| 133 | 133 |
{ name => 'contact', description => $::locale->text('Contact Person (name)') },
|
| 134 | 134 |
{ name => 'department_id', description => $::locale->text('Department (database ID)') },
|
| ... | ... | |
| 579 | 579 |
|
| 580 | 580 |
# Check wether or not taxzone ID is valid. |
| 581 | 581 |
if ($object->taxzone_id && !$self->taxzones_by->{id}->{ $object->taxzone_id }) {
|
| 582 |
push @{ $entry->{errors} }, $::locale->text('Error: Invalid taxzone');
|
|
| 582 |
push @{ $entry->{errors} }, $::locale->text('Error: Invalid tax zone');
|
|
| 583 | 583 |
return 0; |
| 584 | 584 |
} |
| 585 | 585 |
|
| ... | ... | |
| 587 | 587 |
if (!$object->taxzone_id && $entry->{raw_data}->{taxzone}) {
|
| 588 | 588 |
my $taxzone = $self->taxzones_by->{description}->{ $entry->{raw_data}->{taxzone} };
|
| 589 | 589 |
if (!$taxzone) {
|
| 590 |
push @{ $entry->{errors} }, $::locale->text('Error: Invalid taxzone');
|
|
| 590 |
push @{ $entry->{errors} }, $::locale->text('Error: Invalid tax zone');
|
|
| 591 | 591 |
return 0; |
| 592 | 592 |
} |
| 593 | 593 |
|
Auch abrufbar als: Unified diff
Bezeichnung für tax zone geändert und vergessene Klammer hinzugefügt.