From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 12 Aug 2008 12:42:52 +0000 (+0000)
Subject: Auslagern von Hersteller/Modell-Zeilen in eigene Templates. Hersteller/Modell auch... 
X-Git-Tag: release-2.6.0beta2~276
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=602a4d98939e03b3533f5b6de426ee7f719cf2e1;p=kivitendo-erp.git

Auslagern von Hersteller/Modell-Zeilen in eigene Templates. Hersteller/Modell auch wieder für Waren aktiviert, nicht nur für Erzeugnisse. Fix für Bug 843.
---

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index eb31718b9..93758ec8f 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -1523,11 +1523,12 @@ sub form_footer {
     . $locale->text('Update') . qq|">
   |;
 
-  unless ($form->{item} eq "service") {
-    print qq|
-      <input type=hidden name=makemodel_rows value=$form->{makemodel_rows}>
-    |;
-  }
+####### moved into makemodel_row #############
+#  unless ($form->{item} eq "service") {
+#    print qq|
+#      <input type=hidden name=makemodel_rows value=$form->{makemodel_rows}>
+#    |;
+#  }
 
   print qq|
      <input type=hidden name=price_rows value=$form->{price_rows}>|;
@@ -1594,32 +1595,8 @@ sub makemodel_row {
   $lxdebug->enter_sub();
   my ($numrows) = @_;
   
-  print qq|
-  <tr>
-    <td>
-      <table width=100%>
-	<tr>
-	  <th class="listheading">| . $locale->text('Make') . qq|</th>
-	  <th class="listheading">| . $locale->text('Model') . qq|</th>
-	</tr>
-|;
-
-  for my $i (1 .. $numrows) {
-    $form->{"make_$i"}  =~ s/\"/&quot;/g;
-    $form->{"model_$i"} =~ s/\"/&quot;/g;
-    print qq|
-	<tr>
-	  <td width=50%><input name="make_$i" size=30 value="$form->{"make_$i"}"></td>
-	  <td width=50%><input name="model_$i" size=30 value="$form->{"model_$i"}"></td>
-	</tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-|;
+  my @mm_data = grep { $_->{make} ne '' || $_->{model} ne '' } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"} }, 1 .. $numrows;
+  print $form->parse_html_template('ic/makemodel', { MM_DATA => [ @mm_data, {} ], mm_rows => scalar @mm_data + 1 });
 
   $lxdebug->leave_sub();
 }
diff --git a/bin/mozilla/invoice_io.pl b/bin/mozilla/invoice_io.pl
index 2f0f8be50..011c872c8 100644
--- a/bin/mozilla/invoice_io.pl
+++ b/bin/mozilla/invoice_io.pl
@@ -661,7 +661,8 @@ sub display_form {
 
     &{$subroutine}($numrows);
 
-    $numrows    = 0;
+    $numrows    = ++$form->{makemodel_rows};
+    $subroutine = "makemodel_row";
   }
   if ($form->{item} eq 'assembly') {
     $numrows    = $form->{price_rows};
diff --git a/templates/webpages/ic/makemodel_de.html b/templates/webpages/ic/makemodel_de.html
new file mode 100644
index 000000000..f90fba5ce
--- /dev/null
+++ b/templates/webpages/ic/makemodel_de.html
@@ -0,0 +1,19 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+    <td>
+      <table width=100%>
+        <tr>
+          <th class="listheading">Hersteller</th>
+          <th class="listheading">Modell</th>
+        </tr>
+      [%- FOREACH row = MM_DATA %]
+        <tr>
+          <td width=50%><input name="make_[% loop.count %]" size=30 value="[% HTML.escape(row.make) %]"></td>
+          <td width=50%><input name="model_[% loop.count %]" size=30 value="[% HTML.escape(row.model) %]"></td>
+        </tr>
+      [%- END %]
+      </table>
+    </td>
+  </tr>
+  <input type=hidden name=makemodel_rows value=[% mm_rows %]>
diff --git a/templates/webpages/ic/makemodel_master.html b/templates/webpages/ic/makemodel_master.html
new file mode 100644
index 000000000..356143d8d
--- /dev/null
+++ b/templates/webpages/ic/makemodel_master.html
@@ -0,0 +1,19 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+  <tr>
+    <td>
+      <table width=100%>
+        <tr>
+          <th class="listheading"><translate>Make</translate></th>
+          <th class="listheading"><translate>Model</translate></th>
+        </tr>
+      [%- FOREACH row = MM_DATA %]
+        <tr>
+          <td width=50%><input name="make_[% loop.count %]" size=30 value="[% HTML.escape(row.make) %]"></td>
+          <td width=50%><input name="model_[% loop.count %]" size=30 value="[% HTML.escape(row.model) %]"></td>
+        </tr>
+      [%- END %]
+      </table>
+    </td>
+  </tr>
+  <input type=hidden name=makemodel_rows value=[% mm_rows %]>