From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 19 Jan 2007 08:43:18 +0000 (+0000)
Subject: "Gewichtseinheit" entfernt.
X-Git-Tag: release-2.4.1~1^2~17
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5ebbc846ece0cf580417eeaa6e11154b168ada7b;p=kivitendo-erp.git

"Gewichtseinheit" entfernt.
---

diff --git a/SL/AM.pm b/SL/AM.pm
index a9018d74c..ab8dc147a 100644
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1537,7 +1537,6 @@ sub save_preferences {
                  servicenumber = '$form->{servicenumber}',
                  yearend = '$form->{yearend}',
 		 curr = '$form->{curr}',
-		 weightunit = '$form->{weightunit}',
 		 businessnumber = '$form->{businessnumber}'
 		|;
   $dbh->do($query) || $form->dberror($query);
diff --git a/SL/IC.pm b/SL/IC.pm
index 7fca30609..2bbf89a88 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1519,22 +1519,12 @@ sub create_links {
   }
   $sth->finish;
 
-  if ($form->{id}) {
-    $query = qq|SELECT weightunit
-                FROM defaults|;
-    $sth = $dbh->prepare($query);
-    $sth->execute || $form->dberror($query);
-
-    ($form->{weightunit}) = $sth->fetchrow_array;
-    $sth->finish;
-
-  } else {
-    $query = qq|SELECT weightunit, current_date
-                FROM defaults|;
+  if (!$form->{id}) {
+    $query = qq|SELECT current_date FROM defaults|;
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 
-    ($form->{weightunit}, $form->{priceupdate}) = $sth->fetchrow_array;
+    ($form->{priceupdate}) = $sth->fetchrow_array;
     $sth->finish;
   }
 
diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 1fe78205c..18be99ffa 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -3109,8 +3109,6 @@ sub config {
 	      <tr>
 		<th align=right>| . $locale->text('Year End') . qq| (mm/dd)</th>
 		<td><input name=yearend size=5 value=$form->{defaults}{yearend}></td>
-		<th align=right>| . $locale->text('Weight Unit') . qq|</th>
-		<td><input name=weightunit size=5 value="$form->{defaults}{weightunit}"></td>
 	      </tr>
 	    </table>
 	  </td>
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 29970c4ee..06fc13f90 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -2334,11 +2334,6 @@ sub form_header {
 		      <td>
 			<input name=weight size=10 value=$form->{weight}>
 		      </td>
-		      <th>
-			&nbsp;
-			$form->{weightunit}
-			<input type=hidden name=weightunit value=$form->{weightunit}>
-		      </th>
 		    </tr>
 		  </table>
 		</td>
@@ -2369,11 +2364,6 @@ sub form_header {
 			&nbsp;$form->{weight}
 			<input type=hidden name=weight value=$form->{weight}>
 		      </td>
-		      <th>
-			&nbsp;
-			$form->{weightunit}
-			<input type=hidden name=weightunit value=$form->{weightunit}>
-		      </th>
 		    </tr>
 		  </table>
 		</td>
diff --git a/locale/de/all b/locale/de/all
index 9c48c5d71..8244d633d 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -1111,7 +1111,6 @@ gestartet',
   'Warehouses'                  => 'Lager',
   'Warnings during template upgrade' => 'Warnungen bei Aktualisierung der Dokumentenvorlagen',
   'Weight'                      => 'Gewicht',
-  'Weight Unit'                 => 'Gewichtseinheit',
   'What type of item is this?'  => 'Was ist dieser Artikel?',
   'Workflow purchase_order'     => 'Workflow Lieferantenauftrag',
   'Workflow request_quotation'  => 'Workflow Preisanfrage',
diff --git a/locale/de/am b/locale/de/am
index eb7aef1f6..25ed7cdaa 100644
--- a/locale/de/am
+++ b/locale/de/am
@@ -279,7 +279,6 @@ $self->{texts} = {
   'Warehouse deleted!'          => 'Das Lager wurde gelöscht.',
   'Warehouse saved!'            => 'Das Lager wurde gespeichert.',
   'Warehouses'                  => 'Lager',
-  'Weight Unit'                 => 'Gewichtseinheit',
   'Year End'                    => 'Jahresende',
   'Yes'                         => 'Ja',
   'dimension units'             => 'Ma&szlig;einheiten',