"Gewichtseinheit" entfernt.

diff --git a/SL/AM.pm b/SL/AM.pm
index a9018d74c9d4d87acc4ff55407e4bb67b0e34c5d..ab8dc147a8566f08144d207fe2a8d562ef531936 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -1537,7 +1537,6 @@ sub save_preferences {
                  servicenumber = '$form->{servicenumber}',
                  yearend = '$form->{yearend}',
                 curr = '$form->{curr}',
                  servicenumber = '$form->{servicenumber}',
                  yearend = '$form->{yearend}',
                 curr = '$form->{curr}',

-                weightunit = '$form->{weightunit}',

                 businessnumber = '$form->{businessnumber}'
                |;
   $dbh->do($query) || $form->dberror($query);
                 businessnumber = '$form->{businessnumber}'
                |;
   $dbh->do($query) || $form->dberror($query);

diff --git a/SL/IC.pm b/SL/IC.pm
index 7fca30609a778941bab378bb4bd0e17e82c1b98a..2bbf89a88dca0b1fe000665e3e354556f399872d 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -1519,22 +1519,12 @@ sub create_links {
   }
   $sth->finish;
 
   }
   $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);
 
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 

-    ($form->{weightunit}, $form->{priceupdate}) = $sth->fetchrow_array;
+    ($form->{priceupdate}) = $sth->fetchrow_array;

     $sth->finish;
   }
 
     $sth->finish;
   }
 

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 1fe78205cfe8aa2cf2bc633b488a2348f8db793f..18be99ffa985011234ab29e4eda6ef7e83a0da45 100644 (file)
--- 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>
              <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>
              </tr>
            </table>
          </td>

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 29970c4ee81e197e9836a9f8d67b26a5f37f4ed4..06fc13f90762d20aed0d560483ec3982d8319066 100644 (file)
--- 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>
                      <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>
                    </tr>
                  </table>
                </td>


@@ -2369,11 +2364,6 @@ sub form_header {
                        &nbsp;$form->{weight}
                        <input type=hidden name=weight value=$form->{weight}>
                      </td>
                        &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>
                    </tr>
                  </table>
                </td>

diff --git a/locale/de/all b/locale/de/all
index 9c48c5d71fad34b619b9e7f29a6e1ed8bd88d440..8244d633d0e8a1475fc05e0468d69f1c95cb36ad 100644 (file)
--- 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',
   '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',
   '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 eb7aef1f6467268c58e2485afd0b84a7f46c7a9a..25ed7cdaa5053c7f95b21c04d9ce31c61bd78ec2 100644 (file)
--- 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',
   '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ßeinheiten',
   'Year End'                    => 'Jahresende',
   'Yes'                         => 'Ja',
   'dimension units'             => 'Maßeinheiten',