From 4753781c3e312b57c78bde0ad7b95e72c09b498b Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 3 Mar 2011 09:36:52 +0100
Subject: [PATCH] Infotext anzeigen, wenn nur Preis aktualisiert wird

---
 SL/Controller/CsvImport/Base.pm             | 3 ++-
 SL/Controller/CsvImport/Part.pm             | 5 +++--
 locale/de/all                               | 3 ++-
 templates/webpages/csv_import/_preview.html | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 9921cc989..44b1e471a 100644
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -44,7 +44,8 @@ sub run {
   # foreach my $object ($self->csv->get_objects)
   my @objects  = $self->csv->get_objects;
   my @raw_data = @{ $self->csv->get_data };
-  $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [] } } @objects, @raw_data ]);
+  $self->controller->data([ pairwise { { object => $a, raw_data => $b, errors => [], information => [] } } @objects, @raw_data ]);
+  $::lxdebug->dump(0, "DATA", $self->controller->data);
 
   $self->check_objects;
   $self->check_duplicates if $self->controller->profile->get('duplicates', 'no_check') ne 'no_check';
diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm
index 36291cc18..45f479485 100644
--- a/SL/Controller/CsvImport/Part.pm
+++ b/SL/Controller/CsvImport/Part.pm
@@ -191,12 +191,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 {
diff --git a/locale/de/all b/locale/de/all
index 2ee4b9760..1fa97becb 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -214,7 +214,7 @@ $self->{texts} = {
   'Assume Tax Consultant Data in Tax Computation?' => 'Beraterdaten in UStVA übernehmen?',
   'At least'                    => 'Mindestens',
   'At least one Perl module that Lx-Office ERP requires for running is not installed on your system.' => 'Mindestes ein Perl-Modul, das Lx-Office ERP zur Ausf&uuml;hrung ben&ouml;tigt, ist auf Ihrem System nicht installiert.',
-  'At least one of the columns #1, customer, customernumber, vendor, vendornumber (depending on the target table) is required for matching the entry to an existing customer or vendor.' => 'Mindestens eine der Spalten #1, customer, customernumber, vendor, vendornumber (von Zieltabelle abhängig) wird benötigt, um einen Eintrag einem bestehenden Kunden bzw. Lieferanten zuzuordnen.',
+  'At least one of the columns #1, customer, customernumber, vendor, vendornumber (depending on the target table) is required for matching the entry to an existing customer or vendor.' => 'Mindestens eine der Spalten #1, customer, customernumber, vendor, vendornumber (von Zieltabelle abhängig) wird benötigt, um einen Eintrag einem bestehenden Kunden bzw. Lieferanten zuzuordnen.',
   'At most'                     => 'H&ouml;chstens',
   'At the moment the transaction looks like this:' => 'Aktuell sieht die Buchung wie folgt aus:',
   'Attach PDF:'                 => 'PDF anhängen',
@@ -1968,6 +1968,7 @@ $self->{texts} = {
   'Update prices of existing entries' => 'Preise von vorhandenen Artikeln aktualisieren',
   'Update?'                     => 'Aktualisieren?',
   'Updated'                     => 'Erneuert am',
+  'Updating prices of existing entry in database' => 'Preis des Eintrags in der Datenbank wird aktualisiert',
   'Uploaded on #1, size #2 kB'  => 'Am #1 hochgeladen, Größe #2 kB',
   'Use As Template'             => 'Als Vorlage verwenden',
   'Use Templates'               => 'Benutze Vorlagen',
diff --git a/templates/webpages/csv_import/_preview.html b/templates/webpages/csv_import/_preview.html
index 08997b945..d36000cc9 100644
--- a/templates/webpages/csv_import/_preview.html
+++ b/templates/webpages/csv_import/_preview.html
@@ -31,6 +31,7 @@
    [%- END %]
    <td>
     [%- FOREACH error = row.errors %][%- HTML.escape(error) %][% UNLESS loop.last %]<br>[%- END %][%- END %]
+    [%- FOREACH info  = row.information %][% IF !loop.first || row.errors.size %]<br>[%- END %][%- HTML.escape(info) %][%- END %]
    </td>
   </tr>
   [%- END %]
-- 
2.20.1