X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FPart.pm;h=6de1a079ba96e37f845e66993b67a237666ce0e9;hb=a928d0341bf19d1e4842021597395de37ae495aa;hp=9746b7e6483566bdb58fa7e56482abcebe7392b9;hpb=e055b3ff9423767fd109a8d7a36d354c8997c941;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm index 9746b7e64..6de1a079b 100644 --- a/SL/Controller/CsvImport/Part.pm +++ b/SL/Controller/CsvImport/Part.pm @@ -7,7 +7,6 @@ use SL::Helper::Csv; use SL::DB::Buchungsgruppe; use SL::DB::CustomVariable; use SL::DB::CustomVariableConfig; -use SL::DB::Language; use SL::DB::PartsGroup; use SL::DB::PaymentTerm; use SL::DB::PriceFactor; @@ -19,8 +18,8 @@ use parent qw(SL::Controller::CsvImport::Base); use Rose::Object::MakeMethods::Generic ( scalar => [ qw(table) ], - 'scalar --get_set_init' => [ qw(bg_by settings parts_by price_factors_by units_by payment_terms_by packing_types_by partsgroups_by - all_languages translation_columns) ], + 'scalar --get_set_init' => [ qw(bg_by settings parts_by price_factors_by units_by packing_types_by partsgroups_by + translation_columns) ], ); sub init_class { @@ -42,13 +41,6 @@ sub init_price_factors_by { return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_price_factors } } ) } qw(id description) }; } -sub init_payment_terms_by { - my ($self) = @_; - - my $all_payment_terms = SL::DB::Manager::PaymentTerm->get_all; - return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $all_payment_terms } } ) } qw(id description) }; -} - sub init_packing_types_by { my ($self) = @_; @@ -93,12 +85,6 @@ sub init_settings { shoparticle_if_missing parts_type) }; } -sub init_all_languages { - my ($self) = @_; - - return SL::DB::Manager::Language->get_all; -} - sub init_all_cvar_configs { my ($self) = @_; @@ -117,9 +103,6 @@ sub check_objects { return unless @{ $self->controller->data }; foreach my $entry (@{ $self->controller->data }) { - my $object = $entry->{object}; - my $raw_data = $entry->{raw_data}; - next unless $self->check_buchungsgruppe($entry); next unless $self->check_type($entry); next unless $self->check_unit($entry); @@ -205,12 +188,13 @@ sub check_existing { my $object = $entry->{object}; - my $entry->{part} = $self->parts_by->{partnumber}->{ $object->type }->{ $object->partnumber }; + $entry->{part} = $self->parts_by->{partnumber}->{ $object->type }->{ $object->partnumber }; if ($self->settings->{article_number_policy} eq 'update_prices') { if ($entry->{part}) { map { $object->$_( $entry->{part}->$_ ) } qw(sellprice listprice lastcost); - $entry->{priceupdate} = 1; + push @{ $entry->{information} }, $::locale->text('Updating prices of existing entry in database'); + $entry->{object_to_save} = $entry->{part}; } } else { @@ -291,32 +275,6 @@ sub check_price_factor { return 1; } -sub check_payment { - my ($self, $entry) = @_; - - my $object = $entry->{object}; - - # Check whether or not payment ID is valid. - if ($object->payment_id && !$self->payment_terms_by->{id}->{ $object->payment_id }) { - push @{ $entry->{errors} }, $::locale->text('Error: Invalid payment terms'); - return 0; - } - - # Map name to ID if given. - if (!$object->payment_id && $entry->{raw_data}->{payment}) { - my $terms = $self->payment_terms_by->{description}->{ $entry->{raw_data}->{payment} }; - - if (!$terms) { - push @{ $entry->{errors} }, $::locale->text('Error: Invalid payment terms'); - return 0; - } - - $object->payment_id($terms->id); - } - - return 1; -} - sub check_packing_type { my ($self, $entry) = @_; @@ -409,7 +367,7 @@ sub init_profile { my ($self) = @_; my $profile = $self->SUPER::init_profile; - delete @{$profile}{qw(type priceupdate)}; + delete @{$profile}{qw(alternate assembly bom expense_accno_id income_accno_id inventory_accno_id makemodel priceupdate stockable type)}; return $profile; } @@ -426,4 +384,58 @@ sub save_objects { $self->SUPER::save_objects(data => $without_number); } +sub setup_displayable_columns { + my ($self) = @_; + + $self->SUPER::setup_displayable_columns; + $self->add_cvar_columns_to_displayable_columns; + + $self->add_displayable_columns({ name => 'bin', description => $::locale->text('Bin') }, + { name => 'binding_max_qty', description => $::locale->text('Binding Max Qty') }, + { name => 'buchungsgruppen_id', description => $::locale->text('Buchungsgruppe (database ID)') }, + { name => 'buchungsgruppe', description => $::locale->text('Buchungsgruppe (name)') }, + { name => 'description', description => $::locale->text('Description') }, + { name => 'drawing', description => $::locale->text('Drawing') }, + { name => 'ean', description => $::locale->text('EAN') }, + { name => 'formel', description => $::locale->text('Formula') }, + { name => 'gv', description => $::locale->text('Business Volume') }, + { name => 'has_sernumber', description => $::locale->text('Has serial number') }, + { name => 'image', description => $::locale->text('Image') }, + { name => 'lastcost', description => $::locale->text('Last Cost') }, + { name => 'listprice', description => $::locale->text('List Price') }, + { name => 'microfiche', description => $::locale->text('Microfiche') }, + { name => 'min_sellprice', description => $::locale->text('Minimum Sell Price') }, + { name => 'not_discountable', description => $::locale->text('Not Discountable') }, + { name => 'notes', description => $::locale->text('Notes') }, + { name => 'obsolete', description => $::locale->text('Obsolete') }, + { name => 'onhand', description => $::locale->text('On Hand') }, + { name => 'packing_type_id', description => $::locale->text('Packing type (database ID)') }, + { name => 'packing_type', description => $::locale->text('Packing type (name)') }, + { name => 'partnumber', description => $::locale->text('Part Number') }, + { name => 'partsgroup_id', description => $::locale->text('Partsgroup (database ID)') }, + { name => 'partsgroup', description => $::locale->text('Partsgroup (name)') }, + { name => 'payment_id', description => $::locale->text('Payment terms (database ID)') }, + { name => 'payment', description => $::locale->text('Payment terms (name)') }, + { name => 'price_factor_id', description => $::locale->text('Price factor (database ID)') }, + { name => 'price_factor', description => $::locale->text('Price factor (name)') }, + { name => 'rop', description => $::locale->text('ROP') }, + { name => 'sellprice', description => $::locale->text('Sellprice') }, + { name => 'shop', description => $::locale->text('Shopartikel') }, + { name => 'unit', description => $::locale->text('Unit') }, + { name => 've', description => $::locale->text('Verrechnungseinheit') }, + { name => 'weight', description => $::locale->text('Weight') }, + ); + + foreach my $language (@{ $self->all_languages }) { + $self->add_displayable_columns({ name => 'description_' . $language->article_code, + description => $::locale->text('Description (translation for #1)', $language->description) }, + { name => 'notes_' . $language->article_code, + description => $::locale->text('Notes (translation for #1)', $language->description) }); + } +} + +# TODO: +# Preisgruppen +# Preisaktualisierung + 1;