$self->check_language($entry);
$self->check_business($entry);
$self->check_payment($entry);
$self->check_language($entry);
$self->check_business($entry);
$self->check_payment($entry);
- $self->check_currency($entry);
+ $self->check_delivery_term($entry);
+ $self->check_taxzone($entry, take_default => 1);
+ $self->check_currency($entry, take_default => 1);
+ $self->check_salesman($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;
- $existing_vc->$_( $entry->{object}->$_ ) for @{ $methods };
+ $existing_vc->$_( $entry->{object}->$_ ) for @{ $methods }, keys %{ $self->clone_methods };
+
+ $self->handle_cvars($entry);
+ $existing_vc->custom_variables($entry->{object}->custom_variables);
- # Check whether or not currency ID is valid.
- if ($object->currency_id && !$self->currencies_by->{id}->{ $object->currency_id }) {
- push @{ $entry->{errors} }, $::locale->text('Error: Invalid currency');
+ # Check whether or not business ID is valid.
+ if ($object->business_id && !$self->businesses_by->{id}->{ $object->business_id }) {
+ push @{ $entry->{errors} }, $::locale->text('Error: Invalid business');
- if (!$object->currency_id && $entry->{raw_data}->{currency}) {
- my $currency = $self->currencies_by->{name}->{ $entry->{raw_data}->{currency} };
- if (!$currency) {
- push @{ $entry->{errors} }, $::locale->text('Error: Invalid currency');
+ if (!$object->business_id && $entry->{raw_data}->{business}) {
+ my $business = $self->businesses_by->{description}->{ $entry->{raw_data}->{business} };
+
+ if (!$business) {
+ push @{ $entry->{errors} }, $::locale->text('Error: Invalid business');
- # Check whether or not business ID is valid.
- if ($object->business_id && !$self->businesses_by->{id}->{ $object->business_id }) {
- push @{ $entry->{errors} }, $::locale->text('Error: Invalid business');
+ # 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');
- if (!$object->business_id && $entry->{raw_data}->{business}) {
- my $business = $self->businesses_by->{description}->{ $entry->{raw_data}->{business} };
+ 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}) };
{ name => 'customernumber', description => $::locale->text('Customer Number') },
{ name => 'department_1', description => $::locale->text('Department 1') },
{ name => 'department_2', description => $::locale->text('Department 2') },
{ name => 'customernumber', description => $::locale->text('Customer Number') },
{ name => 'department_1', description => $::locale->text('Department 1') },
{ name => 'department_2', description => $::locale->text('Department 2') },
{ name => 'direct_debit', description => $::locale->text('direct debit') },
{ name => 'discount', description => $::locale->text('Discount') },
{ name => 'email', description => $::locale->text('E-mail') },
{ name => 'fax', description => $::locale->text('Fax') },
{ name => 'direct_debit', description => $::locale->text('direct debit') },
{ 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)') });
+ }