use strict;
use SL::Helper::Csv;
-use SL::Helper::Csv::Consistency;
+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);
- SL::Helper::Csv::Consistency->check_currency($entry, take_default => 1);
+ $self->check_delivery_term($entry);
+ $self->check_currency($entry, take_default => 1);
$self->handle_cvars($entry);
next if @{ $entry->{errors} };
# 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;
$self->SUPER::save_objects(data => $without_number);
}
-sub field_lengths {
- return ( name => 75,
- department_1 => 75,
- department_2 => 75,
- street => 75,
- zipcode => 10,
- city => 75,
- country => 75,
- contact => 75,
- fax => 30,
- account_number => 15,
- bank_code => 10,
- language => 5,
- username => 50,
- ustid => 14,
- iban => 100,
- bic => 100,
- );
-}
-
sub init_profile {
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 => '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') },