use SL::DB::Business;
use SL::DB::CustomVariable;
use SL::DB::CustomVariableConfig;
+use SL::DB::Employee;
use SL::DB::PaymentTerm;
use SL::TransNumber;
sub init_salesmen_by {
my ($self) = @_;
- return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ SL::DB::Manager::Employee->get_all } } ) } qw(id name) };
+ return { map { my $col = $_; ( $col => { map { ( lc($_->$col) => $_ ) } @{ SL::DB::Manager::Employee->get_all } } ) } qw(id name login) };
}
sub check_objects {
my %vcs_by_number = map { ( $_->$numbercolumn => $_ ) } @{ $self->existing_objects };
my $methods = $self->controller->headers->{methods};
- my $i;
+ my $i = 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_taxzone($entry, take_default => 1);
$self->check_currency($entry, take_default => 1);
$self->check_salesman($entry);
- $self->handle_cvars($entry);
next if @{ $entry->{errors} };
- 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
+ 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;
- my $existing_vc = $vcs_by_number{ $object->$numbercolumn };
+ my $existing_vc = $object->$numbercolumn ? $vcs_by_number{ $object->$numbercolumn } : undef;
if (!$existing_vc) {
$vcs_by_number{ $object->$numbercolumn } = $object if $object->$numbercolumn;
} else {
$object->$numbercolumn('####');
}
+
+ $self->handle_cvars($entry);
+
} continue {
$i++;
}
}
# Map name to ID if given.
- if (!$object->salesman_id && $entry->{raw_data}->{salesman}) {
- my $salesman = $self->salesmen_by->{name}->{ $entry->{raw_data}->{salesman} };
+ 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}) };
if (!$salesman) {
push @{ $entry->{errors} }, $::locale->text('Error: Invalid salesman');
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 } ];
-
- foreach my $entry (@{$with_number}, @{$without_number}) {
- my $object = $entry->{object};
+ my $with_number = [ grep { ($_->{object}->$numbercolumn || '') ne '####' } @{ $self->controller->data } ];
+ my $without_number = [ grep { ($_->{object}->$numbercolumn || '') eq '####' } @{ $self->controller->data } ];
- my $number = SL::TransNumber->new(type => $self->table(),
- number => $object->$numbercolumn(),
- business_id => $object->business_id(),
- save => 1);
-
- if ( $object->$numbercolumn eq '####' || !$number->is_unique() ) {
- $object->$numbercolumn($number->create_unique());
- }
- }
+ $_->{object}->$numbercolumn('') for @{ $without_number };
$self->SUPER::save_objects(data => $with_number);
$self->SUPER::save_objects(data => $without_number);
my $profile = $self->SUPER::init_profile;
delete @{$profile}{qw(business datevexport language payment delivery_term taxincluded terms)};
- delete @{$profile}{qw(salesman salesman_id)} if $::instance_conf->get_vertreter;
+ delete @{$profile}{qw(salesman salesman_id salesman_login)} if $::instance_conf->get_vertreter;
return $profile;
}
{ name => 'discount', description => $::locale->text('Discount') },
{ name => 'email', description => $::locale->text('E-mail') },
{ name => 'fax', description => $::locale->text('Fax') },
+ { name => 'gln', description => $::locale->text('GLN') },
{ name => 'greeting', description => $::locale->text('Greeting') },
{ name => 'homepage', description => $::locale->text('Homepage') },
{ name => 'iban', description => $::locale->text('IBAN') },
- { name => 'klass', description => $::locale->text('Preisklasse') },
+ { name => 'pricegroup_id', description => $::locale->text('Price group (database ID)') },
{ name => 'language_id', description => $::locale->text('Language (database ID)') },
{ name => 'language', description => $::locale->text('Language (name)') },
{ name => 'name', description => $::locale->text('Name') },
);
if (!$::instance_conf->get_vertreter) {
- $self->add_displayable_columns({ name => 'salesman_id', description => $::locale->text('Salesman (database ID)') });
- $self->add_displayable_columns({ name => 'salesman', description => $::locale->text('Salesman') });
+ $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)') });
}
-
}
# TODO: