PartPicker: keine AJAJ-Requests nach Fat-Data ohne item.id schicken

[mfinanz.git] / SL / Controller / CsvImport / Part.pm

diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm
index 2ca12300a90f064d94ee27f3ca532dc5e46d217b..34bdd73655e637d61b19d5ebb2c4059a4dfa2f0d 100644 (file)
--- a/SL/Controller/CsvImport/Part.pm
+++ b/SL/Controller/CsvImport/Part.pm
@@ -16,6 +16,8 @@ use SL::DB::Price;
 use SL::DB::Translation;
 use SL::DB::Unit;
 
 use SL::DB::Translation;
 use SL::DB::Unit;
 

+use List::MoreUtils qw(none);
+

 use parent qw(SL::Controller::CsvImport::Base);
 
 use Rose::Object::MakeMethods::Generic
 use parent qw(SL::Controller::CsvImport::Base);
 
 use Rose::Object::MakeMethods::Generic


@@ -203,45 +205,46 @@ sub check_existing {
 
   my $object = $entry->{object};
 
 
   my $object = $entry->{object};
 

-  if (!$self->test_run && $object->partnumber && $self->parts_by->{partnumber}{$object->partnumber}) {
-    $entry->{part} = SL::DB::Manager::Part->find_by(
-      SL::DB::Manager::Part->type_filter($object->type),
-      ( partnumber => $object->partnumber )                 x!! $object->partnumber,
-    );
+  if ($object->partnumber && $self->parts_by->{partnumber}{$object->partnumber}) {
+    $entry->{part} = SL::DB::Manager::Part->find_by(partnumber => $object->partnumber);

   }
 
   }
 

-  if ($self->settings->{article_number_policy} eq 'update_prices') {
-    if ($object->partnumber && $self->parts_by->{partnumber}{$object->partnumber}) {
-      push @{ $entry->{information} }, $::locale->text('Updating prices of existing entry in database');
-    }
-    if ($entry->{part}) {
-      map { $entry->{part}->$_( $object->$_ ) if defined $object->$_ } qw(sellprice listprice lastcost);
+  if ($entry->{part}) {
+    if ($self->settings->{article_number_policy} eq 'update_prices') {
+      if ($self->settings->{parts_type} eq 'mixed' && $entry->{part}->type ne $object->type) {
+        push(@{$entry->{errors}}, $::locale->text('Skipping due to existing entry in database with different type'));
+      } else {
+        map { $entry->{part}->$_( $object->$_ ) if defined $object->$_ } qw(sellprice listprice lastcost);
+
+        # merge prices
+        my %prices_by_pricegroup_id = map { $_->pricegroup->id => $_ } $entry->{part}->prices, $object->prices;
+        $entry->{part}->prices(grep { $_ } map { $prices_by_pricegroup_id{$_->id} } @{ $self->all_pricegroups });

 
 

-      # merge prices
-      my %prices_by_pricegroup_id = map { $_->pricegroup->id => $_ } $entry->{part}->prices, $object->prices;
-      $entry->{part}->prices(grep { $_ } map { $prices_by_pricegroup_id{$_->id} } @{ $self->all_pricegroups });
+        push @{ $entry->{information} }, $::locale->text('Updating prices of existing entry in database');
+        $entry->{object_to_save} = $entry->{part};
+      }
+    } elsif ( $self->settings->{article_number_policy} eq 'skip' ) {
+      push(@{$entry->{errors}}, $::locale->text('Skipping due to existing entry in database'));

 
 

-      push @{ $entry->{information} }, $::locale->text('Updating prices of existing entry in database');
-      $entry->{object_to_save} = $entry->{part};
+    } else {
+      $object->partnumber('####');
+      push(@{$entry->{errors}}, $::locale->text('Skipping, for assemblies are not importable (yet)')) if $object->type eq 'assembly';

     }
     }

-  } elsif ( $self->settings->{article_number_policy} eq 'skip' ) {
-    push(@{$entry->{errors}}, $::locale->text('Skipping due to existing entry in database')) if ( $entry->{part} );

   } else {
   } else {

-    $object->partnumber('####') if $entry->{part};
+    push(@{$entry->{errors}}, $::locale->text('Skipping, for assemblies are not importable (yet)')) if $object->type eq 'assembly';

   }
 }
 
 sub handle_prices {
   my ($self, $entry) = @_;
 
   }
 }
 
 sub handle_prices {
   my ($self, $entry) = @_;
 

-  foreach my $column (qw(sellprice listprice lastcost)) {
-    next unless $self->controller->headers->{used}->{ $column };
-
+  foreach my $column (qw(sellprice)) {
+    my $object     = $entry->{object_to_save} || $entry->{object};

     my $adjustment = $self->settings->{sellprice_adjustment};
     my $adjustment = $self->settings->{sellprice_adjustment};

-    my $value      = $entry->{object}->$column;
+    my $value      = $object->$column;

 
     $value = $self->settings->{sellprice_adjustment_type} eq 'percent' ? $value * (100 + $adjustment) / 100 : $value + $adjustment;
 
     $value = $self->settings->{sellprice_adjustment_type} eq 'percent' ? $value * (100 + $adjustment) / 100 : $value + $adjustment;

-    $entry->{object}->$column($::form->round_amount($value, $self->settings->{sellprice_places}));
+    $object->$column($::form->round_amount($value, $self->settings->{sellprice_places}));

   }
 }
 
   }
 }
 


@@ -261,16 +264,24 @@ sub check_type {
   if ($type eq 'mixed') {
     $type = $entry->{raw_data}->{type} =~ m/^p/i ? 'part'
           : $entry->{raw_data}->{type} =~ m/^s/i ? 'service'
   if ($type eq 'mixed') {
     $type = $entry->{raw_data}->{type} =~ m/^p/i ? 'part'
           : $entry->{raw_data}->{type} =~ m/^s/i ? 'service'

+          : $entry->{raw_data}->{type} =~ m/^a/i ? 'assembly'

           :                                        undef;
   }
 
           :                                        undef;
   }
 

-  $entry->{object}->income_accno_id(  $bg->income_accno_id_0 );
-  $entry->{object}->expense_accno_id( $bg->expense_accno_id_0 );
+  $entry->{object}->assembly($type eq 'assembly');
+
+  $entry->{object}->income_accno_id( $bg->income_accno_id_0 );
+
+  if ($type eq 'part' || $type eq 'service') {
+    $entry->{object}->expense_accno_id( $bg->expense_accno_id_0 );
+  }

 
   if ($type eq 'part') {
     $entry->{object}->inventory_accno_id( $bg->inventory_accno_id );
 
   if ($type eq 'part') {
     $entry->{object}->inventory_accno_id( $bg->inventory_accno_id );

+  }
+

 
 

-  } elsif ($type ne 'service') {
+  if (none { $_ eq $type } qw(part service assembly)) {

     push @{ $entry->{errors} }, $::locale->text('Error: Invalid part type');
     return 0;
   }
     push @{ $entry->{errors} }, $::locale->text('Error: Invalid part type');
     return 0;
   }


@@ -486,7 +497,7 @@ sub setup_displayable_columns {
                                  { name => 'not_discountable',   description => $::locale->text('Not Discountable')                                     },
                                  { name => 'notes',              description => $::locale->text('Notes')                                                },
                                  { name => 'obsolete',           description => $::locale->text('Obsolete')                                             },
                                  { 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 => 'onhand',             description => $::locale->text('On Hand') . ' [2]'                                     },

                                  { name => 'partnumber',         description => $::locale->text('Part Number')                                          },
                                  { name => 'partsgroup_id',      description => $::locale->text('Partsgroup (database ID)')                             },
                                  { name => 'partsgroup',         description => $::locale->text('Partsgroup (name)')                                    },
                                  { name => 'partnumber',         description => $::locale->text('Part Number')                                          },
                                  { name => 'partsgroup_id',      description => $::locale->text('Partsgroup (database ID)')                             },
                                  { name => 'partsgroup',         description => $::locale->text('Partsgroup (name)')                                    },


@@ -497,7 +508,7 @@ sub setup_displayable_columns {
                                  { name => 'rop',                description => $::locale->text('ROP')                                                  },
                                  { name => 'sellprice',          description => $::locale->text('Sellprice')                                            },
                                  { name => 'shop',               description => $::locale->text('Shopartikel')                                          },
                                  { name => 'rop',                description => $::locale->text('ROP')                                                  },
                                  { name => 'sellprice',          description => $::locale->text('Sellprice')                                            },
                                  { name => 'shop',               description => $::locale->text('Shopartikel')                                          },

-                                 { name => 'type',               description => $::locale->text('Article type (see below)')                             },
+                                 { name => 'type',               description => $::locale->text('Article type')  . ' [3]'                             },

                                  { name => 'unit',               description => $::locale->text('Unit (if missing or empty default unit will be used)') },
                                  { name => 've',                 description => $::locale->text('Verrechnungseinheit')                                  },
                                  { name => 'weight',             description => $::locale->text('Weight')                                               },
                                  { name => 'unit',               description => $::locale->text('Unit (if missing or empty default unit will be used)') },
                                  { name => 've',                 description => $::locale->text('Verrechnungseinheit')                                  },
                                  { name => 'weight',             description => $::locale->text('Weight')                                               },