From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Wed, 14 May 2014 07:40:55 +0000 (+0200)
Subject: CsvImport Waren: Konsistenz: Fußnote statt 'siehe unten' in der Hilfe.
X-Git-Tag: release-3.2.0beta~453
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=27653d6bbb72f61e0064580d3c9b4185df02efe5;p=kivitendo-erp.git

CsvImport Waren: Konsistenz: Fußnote statt 'siehe unten' in der Hilfe.
---

diff --git a/SL/Controller/CsvImport/Part.pm b/SL/Controller/CsvImport/Part.pm
index 90d0b7115..81471ab95 100644
--- a/SL/Controller/CsvImport/Part.pm
+++ b/SL/Controller/CsvImport/Part.pm
@@ -496,7 +496,7 @@ sub setup_displayable_columns {
                                  { 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')                                               },
diff --git a/locale/de/all b/locale/de/all
index 5f664bc8e..5fb5508f4 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -248,7 +248,7 @@ $self->{texts} = {
   'Article'                     => 'Artikel',
   'Article Code'                => 'Artikelkürzel',
   'Article Code missing!'       => 'Artikelkürzel fehlt',
-  'Article type (see below)'    => 'Artikeltyp (siehe unten)',
+  'Article type'                => 'Artikeltyp',
   'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' => 'Als Konsequenz k&ouml;nnen die gespeicherten Mengen entweder in ein Lager &uuml;berf&uuml;hrt werden, oder f&uuml;r eine frische Lagerverwaltung resettet werden.',
   'Assemblies'                  => 'Erzeugnisse',
   'Assembly'                    => 'Erzeugnis',
diff --git a/locale/en/all b/locale/en/all
index 6f86703b7..af1bf991d 100644
--- a/locale/en/all
+++ b/locale/en/all
@@ -229,7 +229,7 @@ $self->{texts} = {
   'Are you sure?'               => '',
   'Article Code'                => '',
   'Article Code missing!'       => '',
-  'Article type (see below)'    => '',
+  'Article type'                => '',
   'As a result, the saved onhand values of the present goods can be stored into a warehouse designated by you, or will be reset for a proper warehouse tracking' => '',
   'Assemblies'                  => '',
   'Assembly'                    => '',
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 0f8ac959d..cbe49771d 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -113,11 +113,6 @@
    </p>
 
 [%- ELSIF SELF.type == 'parts' %]
-   <p>
-    [%- LxERP.t8("If the article type is set to 'mixed' then a column called 'type' must be present.") %]
-    [% LxERP.t8("Type can be either 'part' or 'service'.") %]
-   </p>
-
    <p>
     [1]:
     [% LxERP.t8('The three columns "make_X", "model_X" and "lastcost_X" with the same number "X" are used to import vendor part numbers and vendor prices.') %]
@@ -129,6 +124,11 @@
     [2]:
     [% LxERP.t8('Onhand only sets the quantity in master data, not in inventory. This is only a legacy info field and will be overwritten as soon as a inventory transfer happens.') %]
    </p>
+   <p>
+    [3]:
+    [% LxERP.t8("If the article type is set to 'mixed' then a column called 'type' must be present.") %]
+    [% LxERP.t8("Type can be either 'part' or 'service'.") %]
+   </p>
 
 [%- ELSIF SELF.type == 'orders' %]
    <p>