use strict;
use SL::Helper::Csv;
+use SL::Controller::CsvImport::Helper::Consistency;
use SL::DB::Business;
use SL::DB::CustomVariable;
use SL::DB::CustomVariableConfig;
$self->check_language($entry);
$self->check_business($entry);
$self->check_payment($entry);
+ $self->check_delivery_term($entry);
+ $self->check_currency($entry, take_default => 1);
$self->handle_cvars($entry);
next if @{ $entry->{errors} };
my $existing_vc = $vcs_by_number{ $object->$numbercolumn };
if (!$existing_vc) {
- $vcs_by_number{ $object->$numbercolumn } = $object;
+ $vcs_by_number{ $object->$numbercolumn } = $object if $object->$numbercolumn;
} elsif ($update_policy eq 'skip') {
push(@{$entry->{errors}}, $::locale->text('Skipping due to existing entry in database'));
# Update existing customer/vendor records.
$entry->{object_to_save} = $existing_vc;
- $existing_vc->$_( $entry->{object}->$_ ) for @{ $methods };
+ $existing_vc->$_( $entry->{object}->$_ ) for @{ $methods }, keys %{ $self->clone_methods };
push @{ $entry->{information} }, $::locale->text('Updating existing entry in database');
$i++;
}
- $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment));
+ $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment delivery_term));
$self->add_cvar_raw_data_columns;
}
}
$object->language_id($language->id);
+
+ # register language_id for method copying later
+ $self->clone_methods->{language_id} = 1;
}
return 1;
}
$object->business_id($business->id);
+
+ # register business_id for method copying later
+ $self->clone_methods->{business_id} = 1;
}
return 1;
my ($self) = @_;
my $profile = $self->SUPER::init_profile;
- delete @{$profile}{qw(business datevexport language payment salesman salesman_id taxincluded terms)};
+ delete @{$profile}{qw(business datevexport language payment delivery_term salesman salesman_id taxincluded terms)};
return $profile;
}
{ name => 'contact', description => $::locale->text('Contact') },
{ name => 'country', description => $::locale->text('Country') },
{ name => 'creditlimit', description => $::locale->text('Credit Limit') },
+ { name => 'currency', description => $::locale->text('Currency') },
+ { name => 'currency_id', description => $::locale->text('Currency (database ID)') },
{ name => 'customernumber', description => $::locale->text('Customer Number') },
{ name => 'department_1', description => $::locale->text('Department 1') },
{ name => 'department_2', description => $::locale->text('Department 2') },
+ { name => 'delivery_term_id', description => $::locale->text('Delivery terms (database ID)') },
+ { name => 'delivery_term', description => $::locale->text('Delivery terms (name)') },
{ name => 'direct_debit', description => $::locale->text('direct debit') },
{ name => 'discount', description => $::locale->text('Discount') },
{ name => 'email', description => $::locale->text('E-mail') },