From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 23 Jan 2008 16:04:23 +0000 (+0000)
Subject: Einlagern: Nach der Artikelauswahl per Popup automatisch "Erneuern" drücken.
X-Git-Tag: release-2.6.0beta1~297
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/94f3406dd6f85ad4c5ac33d6995c438630c2c028?ds=inline

Einlagern: Nach der Artikelauswahl per Popup automatisch "Erneuern" drücken.
---

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index d2ac1fa69..f3fc1e80a 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -127,9 +127,19 @@ sub part_selection_internal {
   $order_dir = 1;
   $order_dir = $form->{"order_dir"} if (defined($form->{"order_dir"}));
 
-  %options   = map { $_ => 1 } split m/:/, $form->{options};
+  my %options;
 
-  map { $form->{$_} = 1 if ($options{$_}) } qw(no_services no_assemblies);
+  foreach my $opt (split m/:/, $form->{options}) {
+    if ($opt =~ /=/) {
+      my ($key, $value) = split m/=/, $opt, 2;
+      $options{$key} = $value;
+
+    } else {
+      $options{$opt} = 1;
+    }
+  }
+
+  map { $form->{$_} = $options{$_} if ($options{$_}) } qw(no_services no_assemblies click_button);
 
   $parts = Common->retrieve_parts(\%myconfig, $form, $order_by, $order_dir);
 
@@ -156,6 +166,8 @@ sub part_selection_internal {
          },
         @header_sort);
 
+  $form->{formname} ||= 'Form';
+
   $form->{title} = $locale->text("Select a part");
   $form->header();
   print $form->parse_html_template("generic/part_selection", { "HEADER" => \@header,
diff --git a/js/part_selection.js b/js/part_selection.js
index 8113e8ba3..5e5ff80a6 100644
--- a/js/part_selection.js
+++ b/js/part_selection.js
@@ -33,6 +33,7 @@ function part_selection_window(input_partnumber, input_description, input_partsi
     "input_partnotes="         + escape_more(input_partnotes)   + "&" +
     "filter="                  + escape_more(filter)            + "&" +
     "options="                 + escape_more(options)           + "&" +
+    "formname="                + escape_more(formname)          + "&" +
     "allow_creation="          + (allow_creation ? "1" : "0")   + "&" +
     "action_on_part_selected=" + (null == action_on_part_selected ? "" : action_on_part_selected.value);
   //alert(url);
diff --git a/templates/webpages/generic/part_selection_de.html b/templates/webpages/generic/part_selection_de.html
index f6c8b02fb..4569befd8 100644
--- a/templates/webpages/generic/part_selection_de.html
+++ b/templates/webpages/generic/part_selection_de.html
@@ -9,6 +9,7 @@
   <input type="hidden" name="allow_creation" value="[% HTML.escape(allow_creation) %]">
   <input type="hidden" name="action_on_part_selected" value="[% HTML.escape(action_on_part_selected) %]">
   <input type="hidden" name="filter" value="[% HTML.escape(filter) %]">
+  <input type="hidden" name="options" value="[% HTML.escape(options) %]">
   <input type="hidden" name="new_description" value="[% HTML.escape(description) %]">
 
   <div class="listtop">[% title %]</div>
@@ -92,7 +93,7 @@
         }
         if (document.Form.action_on_part_selected.value != "") {
           window.opener.document.getElementsByName("action")[0].value = document.Form.action_on_part_selected.value;
-          window.opener.document.Form.submit();
+          window.opener.document.[% formname %].submit();
         }
 
 
@@ -107,6 +108,10 @@
           input.value = name;
         }
 
+        [%- IF click_button %]
+        window.opener.document.[% formname %].[% click_button %].click();
+        [%- END %]
+
         self.close();
       }
       //-->
diff --git a/templates/webpages/generic/part_selection_master.html b/templates/webpages/generic/part_selection_master.html
index 41c3f5181..7eb7ef6b2 100644
--- a/templates/webpages/generic/part_selection_master.html
+++ b/templates/webpages/generic/part_selection_master.html
@@ -9,6 +9,7 @@
   <input type="hidden" name="allow_creation" value="[% HTML.escape(allow_creation) %]">
   <input type="hidden" name="action_on_part_selected" value="[% HTML.escape(action_on_part_selected) %]">
   <input type="hidden" name="filter" value="[% HTML.escape(filter) %]">
+  <input type="hidden" name="options" value="[% HTML.escape(options) %]">
   <input type="hidden" name="new_description" value="[% HTML.escape(description) %]">
 
   <div class="listtop">[% title %]</div>
@@ -92,7 +93,7 @@
         }
         if (document.Form.action_on_part_selected.value != "") {
           window.opener.document.getElementsByName("action")[0].value = document.Form.action_on_part_selected.value;
-          window.opener.document.Form.submit();
+          window.opener.document.[% formname %].submit();
         }
 
 
@@ -107,6 +108,10 @@
           input.value = name;
         }
 
+        [%- IF click_button %]
+        window.opener.document.[% formname %].[% click_button %].click();
+        [%- END %]
+
         self.close();
       }
       //-->
diff --git a/templates/webpages/wh/warehouse_selection_stock_de.html b/templates/webpages/wh/warehouse_selection_stock_de.html
index 745c5f25f..c36d581f3 100644
--- a/templates/webpages/wh/warehouse_selection_stock_de.html
+++ b/templates/webpages/wh/warehouse_selection_stock_de.html
@@ -96,7 +96,7 @@
      <th align="right" nowrap>Artikelbeschreibung</th>
      <td>
       <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:no_assemblies')" value="?">
+      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:no_assemblies:click_button=update_button')" value="?">
      </td>
     </tr>
 
@@ -124,7 +124,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="Erneuern">
+   <input type="submit" class="submit" name="action" id="update_button" value="Erneuern">
    [%- IF parts_id %]
    <input type="submit" class="submit" name="action" value="Einlagern">
    [%- END %]
diff --git a/templates/webpages/wh/warehouse_selection_stock_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html
index a3475d1c7..8ff944ebe 100644
--- a/templates/webpages/wh/warehouse_selection_stock_master.html
+++ b/templates/webpages/wh/warehouse_selection_stock_master.html
@@ -96,7 +96,7 @@
      <th align="right" nowrap><translate>Part Description</translate></th>
      <td>
       <input name="description" size="30" value="[% HTML.escape(description) %]">
-      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:no_assemblies')" value="?">
+      <input type="button" onclick="part_selection_window('partnumber', 'description', 'parts_id', 0, 'Form', 'no_services:no_assemblies:click_button=update_button')" value="?">
      </td>
     </tr>
 
@@ -124,7 +124,7 @@
   </p>
 
   <p>
-   <input type="submit" class="submit" name="action" value="<translate>Update</translate>">
+   <input type="submit" class="submit" name="action" id="update_button" value="<translate>Update</translate>">
    [%- IF parts_id %]
    <input type="submit" class="submit" name="action" value="<translate>Stock</translate>">
    [%- END %]