DB-Upgrade Eindeutige Artikelnummern: Fixes & Spalte "Gültig" anzeigen

diff --git a/locale/de/all b/locale/de/all
index ddb7cd4af4ef20dadb0d2681dd0f50193f671e39..dbfe63586878609621c5498a8dbf6049a0bbcced 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -284,7 +284,7 @@ $self->{texts} = {
   'Batch Printing'              => 'Druck',
   'Bcc'                         => 'Bcc',
   'Bcc E-mail'                  => 'BCC (E-Mail)',
   'Batch Printing'              => 'Druck',
   'Bcc'                         => 'Bcc',
   'Bcc E-mail'                  => 'BCC (E-Mail)',

-  'Because the useability gets worse if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' => 'translation',
+  'Because the useability gets worse if one partnumber is used for several parts (for example if you are searching a position for an invoice), partnumbers should be unique.' => 'Da die Benutzerfreundlichkeit durch doppelte Artikelnummern erheblich verschlechtert wird (zum Beispiel, wenn man einen Artikel für eine Rechnung sucht), sollten Artikelnummern eindeutig vergeben sein.',

   'Belegnummer'                 => 'Buchungsnummer',
   'Beratername'                 => 'Beratername',
   'Beraternummer'               => 'Beraternummer',
   'Belegnummer'                 => 'Buchungsnummer',
   'Beratername'                 => 'Beratername',
   'Beraternummer'               => 'Beraternummer',

diff --git a/sql/Pg-upgrade2/erzeugnisnummern.pl b/sql/Pg-upgrade2/erzeugnisnummern.pl
index 81c02416011acd10e7552f5e3ac6d8de7a8396a8..41468946124b435592d8e649f4e664f6583e58f9 100644 (file)
--- a/sql/Pg-upgrade2/erzeugnisnummern.pl
+++ b/sql/Pg-upgrade2/erzeugnisnummern.pl
@@ -8,6 +8,8 @@ use utf8;
 
 use parent qw(SL::DBUpgrade2::Base);
 
 
 use parent qw(SL::DBUpgrade2::Base);
 

+use SL::DBUtils;
+

 sub run {
   my ($self) = @_;
 
 sub run {
   my ($self) = @_;
 


@@ -21,7 +23,7 @@ sub run {
     $self->dbh->commit();
   }
 
     $self->dbh->commit();
   }
 

-  my $query = qq|SELECT id, partnumber, description, unit, notes, assembly, ean, inventory_accno_id
+  my $query = qq|SELECT id, partnumber, description, unit, notes, assembly, ean, inventory_accno_id, obsolete

                    FROM parts pa
                    WHERE (SELECT COUNT(*)
                           FROM parts p
                    FROM parts pa
                    WHERE (SELECT COUNT(*)
                           FROM parts p


@@ -29,14 +31,7 @@ sub run {
                           > 1
                    ORDER BY partnumber;|;
 
                           > 1
                    ORDER BY partnumber;|;
 

-  my $sth = $self->dbh->prepare($query);
-  $sth->execute || $::form->dberror($query);
-
-  $::form->{PARTS} = [];
-  while (my $ref = $sth->fetchrow_hashref("NAME_lc")) {
-    map {$ref->{$_} = $::locale->{iconv_utf8}->convert($ref->{$_})} keys %$ref;
-    push @{ $::form->{PARTS} }, $ref;
-  }
+  $::form->{PARTS} = [ selectall_hashref_query($::form, $self->dbh, $query) ];

 
   if ( scalar @{ $::form->{PARTS} } > 0 ) {
     &print_error_message;
 
   if ( scalar @{ $::form->{PARTS} } > 0 ) {
     &print_error_message;

diff --git a/templates/webpages/dbupgrade/erzeugnisnummern.html b/templates/webpages/dbupgrade/erzeugnisnummern.html
index 800370f8065d8c71ea031b6ce761452c661b3a69..646685493f0dfa99a30ef1477fbe67e29ab5af09 100644 (file)
--- a/templates/webpages/dbupgrade/erzeugnisnummern.html
+++ b/templates/webpages/dbupgrade/erzeugnisnummern.html
@@ -1,5 +1,5 @@
 [%- USE T8 %]
 [%- USE T8 %]

-[% USE HTML %]<div class="listtop">[% 'Double partnumbers' | $T8 %]</div>
+[% USE HTML %][%- USE LxERP -%]<div class="listtop">[% 'Double partnumbers' | $T8 %]</div>

 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">


@@ -19,6 +19,7 @@
     <th class="listheading">[% 'Notes' | $T8 %]</th>
     <th class="listheading">[% 'EAN' | $T8 %]</th>
     <th class="listheading">[% 'Service, assembly or part' | $T8 %]</th>
     <th class="listheading">[% 'Notes' | $T8 %]</th>
     <th class="listheading">[% 'EAN' | $T8 %]</th>
     <th class="listheading">[% 'Service, assembly or part' | $T8 %]</th>

+    <th class="listheading">[% 'Obsolete' | $T8 %]</th>

   </tr>
 
   [% SET row_odd = '1' %][% FOREACH row = PARTS %]
   </tr>
 
   [% SET row_odd = '1' %][% FOREACH row = PARTS %]


@@ -30,6 +31,7 @@
     <td align="right">[% HTML.escape(row.notes) %]</td>
     <td align="right">[% HTML.escape(row.ean) %]</td>
     <td align="right">[% IF row.assembly %] [% 'assembly' | $T8 %] [% ELSE %] [% IF row.inventory_accno_id %] [% 'part' | $T8 %] [% ELSE %] [% 'service' | $T8 %] [% END %] [% END %]</td>
     <td align="right">[% HTML.escape(row.notes) %]</td>
     <td align="right">[% HTML.escape(row.ean) %]</td>
     <td align="right">[% IF row.assembly %] [% 'assembly' | $T8 %] [% ELSE %] [% IF row.inventory_accno_id %] [% 'part' | $T8 %] [% ELSE %] [% 'service' | $T8 %] [% END %] [% END %]</td>

+    <td>[% IF row.obsolete %][%- LxERP.t8("Obsolete") %][%- ELSE %][%- LxERP.t8("Not obsolete") %][%- END %]</td>

   </tr>
   [% SET rowcount = loop.count %]
   [% END %]
   </tr>
   [% SET rowcount = loop.count %]
   [% END %]