Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / SL / Controller / CsvImport / Part.pm

diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm
index c032921..387bdb5 100644 (file)
--- a/SL/Controller/CsvImport/Part.pm
+++ b/SL/Controller/CsvImport/Part.pm
@@ -198,7 +198,12 @@ sub check_existing {
 
   if ($self->settings->{article_number_policy} eq 'update_prices') {
     if ($entry->{part}) {
-      map { $entry->{part}->$_( $object->$_ ) } qw(sellprice listprice lastcost prices);
+      map { $entry->{part}->$_( $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 });
+
       push @{ $entry->{information} }, $::locale->text('Updating prices of existing entry in database');
       $entry->{object_to_save} = $entry->{part};
     }
@@ -414,39 +419,39 @@ sub setup_displayable_columns {
   $self->SUPER::setup_displayable_columns;
   $self->add_cvar_columns_to_displayable_columns;
 
-  $self->add_displayable_columns({ name => 'bin',                description => $::locale->text('Bin')                           },
-                                 { 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 => 'make_X',             description => $::locale->text('Make (with X being a number)')  },
-                                 { name => 'microfiche',         description => $::locale->text('Microfiche')                    },
-                                 { name => 'model_X',            description => $::locale->text('Model (with X being a number)') },
-                                 { 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 => '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 => 'type',               description => $::locale->text('Article type (see below)')      },
+  $self->add_displayable_columns({ name => 'bin',                description => $::locale->text('Bin')                                                  },
+                                 { 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 => 'make_X',             description => $::locale->text('Make (with X being a number)')                         },
+                                 { name => 'microfiche',         description => $::locale->text('Microfiche')                                           },
+                                 { name => 'model_X',            description => $::locale->text('Model (with X being a number)')                        },
+                                 { 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 => '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 => 'type',               description => $::locale->text('Article type (see below)')                             },
                                  { 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 => 've',                 description => $::locale->text('Verrechnungseinheit')                                  },
+                                 { name => 'weight',             description => $::locale->text('Weight')                                               },
                                 );
 
   foreach my $language (@{ $self->all_languages }) {