Add variable to indicate whether or not Information fields apply to t…

…he upload Correct title variable usage for Inventory import
ledgersmb · Dec 8, 2021 · 0e5d824 · 0e5d824
1 parent a11e6dc
commit 0e5d824
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/UI/import_csv/import_csv.html b/UI/import_csv/import_csv.html
@@ -13,9 +13,10 @@
              name = "type"
              value = request.type
              } %]
-      [% IF request.multi %]
+      [% IF request.show_batch_title %]
       <div class="listtop">[% text('Batch Information') %]</div>
       [% END %]
+      [% IF request.show_input %]
       <div data-dojo-type="lsmb/layout/TableContainer"
            data-dojo-props="cols:1">
         <div class="inputrow" id = "referencerow">
@@ -54,6 +55,7 @@
                  } %]
         </div>
       </div>
+      [% END %]
       <div class="inputrow" id="filerow">
         [% PROCESS input element_data = {
                name = "import_file"

diff --git a/UI/import_csv/import_inventory_csv.html b/UI/import_csv/import_inventory_csv.html
@@ -1,7 +1,7 @@
 [% PROCESS 'elements.html' %]
 <body class="lsmb [% dojo_theme %]">
-<div class="listtop">[% title %]</div>
-<div class="info">[% info %]</div>
+<div class="listtop">[% request.title %]</div>
+<div class="info">[% request.info %]</div>
 <form data-dojo-type="lsmb/Form" action="[% request.script %]" method="post" enctype="multipart/form-data">
 <div class="inputrow" id="ar-account-row">
 [% PROCESS select element_data = {

diff --git a/lib/LedgerSMB/Scripts/import_csv.pm b/lib/LedgerSMB/Scripts/import_csv.pm
@@ -106,7 +106,7 @@ my $header_info = {
         title => 'Inventory Batch Import',
         info => ''
     },
-    goods => {
+    parts => {
         title => 'Goods Import',
         info => ''
     },
@@ -648,7 +648,8 @@ sub begin_import {
 
     $request->{title} = $header_info->{$request->{type}}->{title};
     $request->{info} = $header_info->{$request->{type}}->{info};
-    $request->{multi} = 1 if $request->{type} =~ s/multi$//;
+    $request->{show_batch_title} = 1 if $request->{type} =~ m/multi$/;
+    $request->{show_input} = 1 if ($request->{type} =~ m/multi$/ or $request->{type} eq 'gl');
 
     # $request->{page_id} = $request->{type};
     # $request->{page_id} =~ s/_/-/;