my %vcs_by_number = map { ( $_->$numbercolumn => $_ ) } @{ $self->existing_objects };
my $methods = $self->controller->headers->{methods};
my %vcs_by_number = map { ( $_->$numbercolumn => $_ ) } @{ $self->existing_objects };
my $methods = $self->controller->headers->{methods};
my $num_data = scalar @{ $self->controller->data };
foreach my $entry (@{ $self->controller->data }) {
$self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
my $num_data = scalar @{ $self->controller->data };
foreach my $entry (@{ $self->controller->data }) {
$self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
$self->check_business($entry);
$self->check_payment($entry);
$self->check_delivery_term($entry);
$self->check_business($entry);
$self->check_payment($entry);
$self->check_delivery_term($entry);
- my @cleaned_fields = $self->clean_fields(qr{[\r\n]}, $object, qw(name department_1 department_2 street zipcode city country contact phone fax homepage email cc bcc
- taxnumber account_number bank_code bank username greeting));
+ my @cleaned_fields = $self->clean_fields(qr{[\r\n]}, $object, qw(name department_1 department_2 street zipcode city country gln contact phone fax homepage email cc bcc
+ taxnumber account_number bank_code bank username greeting taxzone));
push @{ $entry->{information} }, $::locale->text('Illegal characters have been removed from the following fields: #1', join(', ', @cleaned_fields))
if @cleaned_fields;
push @{ $entry->{information} }, $::locale->text('Illegal characters have been removed from the following fields: #1', join(', ', @cleaned_fields))
if @cleaned_fields;
- my $numbercolumn = $self->table . 'number';
- my $with_number = [ grep { $_->{object}->$numbercolumn ne '####' } @{ $self->controller->data } ];
- my $without_number = [ grep { $_->{object}->$numbercolumn eq '####' } @{ $self->controller->data } ];
+ my $object = $entry->{object};
- foreach my $entry (@{$with_number}, @{$without_number}) {
- my $object = $entry->{object};
+ # Check whether or not salesman ID is valid.
+ if ($object->salesman_id && !$self->salesmen_by->{id}->{ $object->salesman_id }) {
+ push @{ $entry->{errors} }, $::locale->text('Error: Invalid salesman');
+ return 0;
+ }
- my $number = SL::TransNumber->new(type => $self->table(),
- number => $object->$numbercolumn(),
- business_id => $object->business_id(),
- save => 1);
+ # Map name to ID if given.
+ if (!$object->salesman_id && ($entry->{raw_data}->{salesman} || $entry->{raw_data}->{salesman_login})) {
+ my $salesman = $self->salesmen_by->{name} ->{ lc($entry->{raw_data}->{salesman}) }
+ // $self->salesmen_by->{login}->{ lc($entry->{raw_data}->{salesman_login}) };
+ return 1;
+}
+
+sub save_objects {
+ my ($self, %params) = @_;
+
+ my $numbercolumn = $self->table . 'number';
+ my $with_number = [ grep { ($_->{object}->$numbercolumn || '') ne '####' } @{ $self->controller->data } ];
+ my $without_number = [ grep { ($_->{object}->$numbercolumn || '') eq '####' } @{ $self->controller->data } ];
+
+ $_->{object}->$numbercolumn('') for @{ $without_number };
+
$self->SUPER::save_objects(data => $with_number);
$self->SUPER::save_objects(data => $without_number);
}
$self->SUPER::save_objects(data => $with_number);
$self->SUPER::save_objects(data => $without_number);
}
{ name => 'discount', description => $::locale->text('Discount') },
{ name => 'email', description => $::locale->text('E-mail') },
{ name => 'fax', description => $::locale->text('Fax') },
{ name => 'discount', description => $::locale->text('Discount') },
{ name => 'email', description => $::locale->text('E-mail') },
{ name => 'fax', description => $::locale->text('Fax') },
{ name => 'greeting', description => $::locale->text('Greeting') },
{ name => 'homepage', description => $::locale->text('Homepage') },
{ name => 'iban', description => $::locale->text('IBAN') },
{ name => 'greeting', description => $::locale->text('Greeting') },
{ name => 'homepage', description => $::locale->text('Homepage') },
{ name => 'iban', description => $::locale->text('IBAN') },
{ name => 'language_id', description => $::locale->text('Language (database ID)') },
{ name => 'language', description => $::locale->text('Language (name)') },
{ name => 'name', description => $::locale->text('Name') },
{ name => 'language_id', description => $::locale->text('Language (database ID)') },
{ name => 'language', description => $::locale->text('Language (name)') },
{ name => 'name', description => $::locale->text('Name') },
{ name => 'phone', description => $::locale->text('Phone') },
{ name => 'street', description => $::locale->text('Street') },
{ name => 'taxnumber', description => $::locale->text('Tax Number / SSN') },
{ name => 'phone', description => $::locale->text('Phone') },
{ name => 'street', description => $::locale->text('Street') },
{ name => 'taxnumber', description => $::locale->text('Tax Number / SSN') },
- { name => 'taxzone_id', description => $::locale->text('Steuersatz') },
+ { name => 'taxzone', description => $::locale->text('Tax zone (description)') },
+ { name => 'taxzone_id', description => $::locale->text('Tax zone (database ID)') },
{ name => 'user_password', description => $::locale->text('Password') },
{ name => 'username', description => $::locale->text('Username') },
{ name => 'ustid', description => $::locale->text('sales tax identification number') },
{ name => 'zipcode', description => $::locale->text('Zipcode') },
);
{ name => 'user_password', description => $::locale->text('Password') },
{ name => 'username', description => $::locale->text('Username') },
{ name => 'ustid', description => $::locale->text('sales tax identification number') },
{ name => 'zipcode', description => $::locale->text('Zipcode') },
);
+
+ if (!$::instance_conf->get_vertreter) {
+ $self->add_displayable_columns({ name => 'salesman', description => $::locale->text('Salesman') },
+ { name => 'salesman_id', description => $::locale->text('Salesman (database ID)') },
+ { name => 'salesman_login', description => $::locale->text('Salesman (login)') });
+ }