From: Niclas Zimmermann <niclas@kivitendo-premium.de>
Date: Mon, 10 Jun 2013 15:34:16 +0000 (+0200)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~340^2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/937e37ad007405c6a3a389ee18006379ffecc073?hp=3123d6f881b77d0d08874b2fa5356a81710fc930

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

diff --git a/SL/User.pm b/SL/User.pm
index e11fda4ce..871a453f7 100644
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -137,7 +137,7 @@ sub login {
 
     if ($update_available) {
       $form->{"title"} = $main::locale->text("Dataset upgrade");
-      $form->header();
+      $form->header(no_layout => $form->{no_layout});
       print $form->parse_html_template("dbupgrade/header");
 
       $form->{dbupdate} = "db$myconfig{dbname}";
diff --git a/locale/de/all b/locale/de/all
index 4d3cbce8f..a292a2a6f 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -442,6 +442,7 @@ $self->{texts} = {
   'Close Flash'                 => 'Schließen',
   'Close SEPA exports'          => 'SEPA-Export abschließen',
   'Close Window'                => 'Fenster Schlie&szlig;en',
+  'Close window'                => 'Fenster schließen',
   'Closed'                      => 'Geschlossen',
   'Collective Orders only work for orders from one customer!' => 'Sammelaufträge funktionieren nur für Aufträge von einem Kunden!',
   'Column name'                 => 'Spaltenname',
@@ -915,6 +916,7 @@ $self->{texts} = {
   'Filter date by'              => 'Datum filtern nach',
   'Filter for customer variables' => 'Filter für benutzerdefinierte Kundenvariablen',
   'Filter for item variables'   => 'Filter für benutzerdefinierte Artikelvariablen',
+  'Filter parts'                => 'Artikel filtern',
   'Finish'                      => 'Abschlie&szlig;en',
   'First 20 Lines'              => 'Nur erste 20 Datensätze',
   'Fix transaction'             => 'Buchung korrigieren',
@@ -1434,6 +1436,7 @@ $self->{texts} = {
   'Parts must have an entry type.' => 'Waren m&uuml;ssen eine Buchungsgruppe haben.',
   'Parts with existing part numbers' => 'Artikel mit existierender Artikelnummer',
   'Parts, services and assemblies' => 'Waren, Dienstleistungen und Erzeugnisse',
+  'Parts:'                      => 'Artikel:',
   'Partsgroup (database ID)'    => 'Warengruppe (Datenbank-ID)',
   'Partsgroup (name)'           => 'Warengruppe (Name)',
   'Password'                    => 'Passwort',
@@ -1778,6 +1781,7 @@ $self->{texts} = {
   'Service unit'                => 'Dienstleistungseinheit',
   'Service, assembly or part'   => 'Dienstleistung, Erzeugnis oder Ware',
   'Services'                    => 'Dienstleistungen',
+  'Services, assemblies or parts' => 'Dienstleistungen, Erzeugnisse oder Waren',
   'Set Language Values'         => 'Spracheinstellungen',
   'Set eMail text'              => 'eMail Text eingeben',
   'Settings'                    => 'Einstellungen',
@@ -1813,6 +1817,7 @@ $self->{texts} = {
   'Show TODO list'              => 'Aufgabenliste anzeigen',
   'Show Transfer via default'   => 'Ein- / Auslagern über Standardlagerplatz anzeigen',
   'Show administration link'    => 'Link zur Administration anzeigen',
+  'Show all parts'              => 'Alle Artikel anzeigen',
   'Show by default'             => 'Standardm&auml;&szlig;ig anzeigen',
   'Show custom variable search inputs' => 'Suchoptionen für Benutzerdefinierte Variablen verstecken',
   'Show delete button in purchase delivery orders?' => 'Soll der "Löschen"-Knopf bei Einkaufslieferscheinen angezeigt werden?',
@@ -2300,6 +2305,7 @@ $self->{texts} = {
   'Valid'                       => 'Gültig',
   'Valid from'                  => 'Gültig ab',
   'Valid until'                 => 'gültig bis',
+  'Valid/Obsolete'              => 'Gültig/ungültig',
   'Value'                       => 'Wert',
   'Variable'                    => 'Variable',
   'Variable Description'        => 'Datenfeldbezeichnung',
diff --git a/sql/Pg-upgrade2/erzeugnisnummern.pl b/sql/Pg-upgrade2/erzeugnisnummern.pl
index 414689461..a6e95937f 100644
--- a/sql/Pg-upgrade2/erzeugnisnummern.pl
+++ b/sql/Pg-upgrade2/erzeugnisnummern.pl
@@ -13,6 +13,10 @@ use SL::DBUtils;
 sub run {
   my ($self) = @_;
 
+  if ($::form->{upgrade_action} eq 'filter_parts') {
+    return $self->filter_parts($self);
+  }
+
   if ( $::form->{'continued'} ) {
     my $update_query;
     foreach my $i (1 .. $::form->{rowcount}) {
@@ -50,4 +54,62 @@ sub print_error_message {
   print $::form->parse_html_template("dbupgrade/erzeugnisnummern");
 }
 
+sub filter_parts {
+  my $self = shift;
+
+  my $where = 'TRUE';
+  my @values;
+
+  if ( $::form->{filter_partnumber} ) {
+    $where .= ' AND partnumber ILIKE ?';
+    push(@values, $::form->like( $::form->{filter_partnumber} ));
+  }
+
+  if ($::form->{filter_description}) {
+    $where .= ' AND description ILIKE ?';
+    push(@values, $::form->like($::form->{filter_description}));
+  }
+
+  if ($::form->{filter_notes}) {
+    $where .= ' AND notes ILIKE ?';
+    push(@values, $::form->like($::form->{filter_notes}));
+  }
+
+  if ($::form->{filter_ean}) {
+    $where .= ' AND ean ILIKE ?';
+    push(@values, $::form->like($::form->{filter_ean}));
+  }
+
+  if ($::form->{filter_type} eq 'assembly') {
+    $where .= ' AND assembly';
+  }
+
+  if ($::form->{filter_type} eq 'service') {
+    $where .= ' AND inventory_accno_id IS NULL AND NOT assembly';
+  }
+
+  if ($::form->{filter_type} eq 'part') {
+    $where .= ' AND inventory_accno_id IS NOT NULL';
+    $where .= ' AND NOT assembly';
+  }
+
+  if ($::form->{filter_obsolete} eq 'obsolete') {
+    $where .= ' AND obsolete';
+  }
+
+  if ($::form->{filter_obsolete} eq 'valid') {
+    $where .= ' AND NOT obsolete';
+  }
+
+  my $query = qq|SELECT id, partnumber, description, unit, notes, assembly, ean, inventory_accno_id, obsolete
+                 FROM parts
+                 WHERE $where
+                 ORDER BY partnumber|;
+
+  $::form->{ALL_PARTS} = [ selectall_hashref_query($::form, $self->dbh, $query, @values) ];
+
+  print $::form->parse_html_template("dbupgrade/show_partlist");
+  return 2;
+}
+
 1;
diff --git a/templates/webpages/dbupgrade/erzeugnisnummern.html b/templates/webpages/dbupgrade/erzeugnisnummern.html
index 646685493..5b8f1a6c5 100644
--- a/templates/webpages/dbupgrade/erzeugnisnummern.html
+++ b/templates/webpages/dbupgrade/erzeugnisnummern.html
@@ -1,5 +1,17 @@
 [%- USE T8 %]
 [% USE HTML %][%- USE LxERP -%]<div class="listtop">[% 'Double partnumbers' | $T8 %]</div>
+<script type="text/javascript">
+<!--
+function show_parts(vc) {
+  var width = 750;
+  var height = 550;
+  var parm = centerParms(width, height) + ",width=" + width + ",height=" + height + ",status=yes,scrollbars=yes";
+  url = "controller.pl?action=LoginScreen/login&upgrade_action=filter_parts&no_layout=1"
+  //alert(url);
+  window.open(url, "_new_generic", parm);
+}
+//-->
+</script>
 
 <form name="Form" method="post" action="login.pl">
 <input type="hidden" name="action" value="login">
@@ -38,6 +50,9 @@
   <input type="hidden" name="rowcount" value="[% rowcount %]">
 </table>
 
+<input type="button" value="[% 'Show all parts' | $T8 %]" onclick="show_parts('customer')">
+<br>
+<br>
 <input type="submit" value="[% 'Continue' | $T8 %]">
 
 </form>