Einheiten bearbeiten: Faktoren nicht forciert mit fünf Stellen anzeigen.

[kivitendo-erp.git] / bin / mozilla / am.pl

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 60814f2..27ccd06 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -177,10 +177,14 @@ sub account_header {
             76  => $locale->text('UStVA-Nr. 76'),
             77  => $locale->text('UStVA-Nr. 77'),
             80  => $locale->text('UStVA-Nr. 80'),
+            81  => $locale->text('UStVA-Nr. 81 left'),
+            811 => $locale->text('UStVA-Nr. 81 right'),
             84  => $locale->text('UStVA-Nr. 84'),
             85  => $locale->text('UStVA-Nr. 85'),
             86  => $locale->text('UStVA-Nr. 86 left'),
             861 => $locale->text('UStVA-Nr. 86 right'),
+            89  => $locale->text('UStVA-Nr. 89 left'),
+            891 => $locale->text('UStVA-Nr. 89 right'),
             91  => $locale->text('UStVA-Nr. 91'),
             93  => $locale->text('UStVA-Nr. 93 left'),
             931 => $locale->text('UStVA-Nr. 93 right'),
@@ -594,7 +598,7 @@ sub list_account {
     $ca->{link_edit_account} = 
         qq|$form->{script}?action=edit_account&id=$ca->{id}|
        .qq|&path=$form->{path}&login=$form->{login}|
-       .qq|&password=$form->{password}&callback=$callback>$ca->{accno}|;
+       .qq|&password=$form->{password}&callback=$callback|;
   }
   
   my $parameters_ref = {
@@ -1778,11 +1782,11 @@ sub list_buchungsgruppe {
                      income_accno_3 expense_accno_3 );
 
   $column_header{up} =
-      qq|<th class="listheading">|
+      qq|<th class="listheading" width="16">|
     . qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">|
     . qq|</th>|;
   $column_header{down} =
-      qq|<th class="listheading">|
+      qq|<th class="listheading" width="16">|
     . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
     . qq|</th>|;
   $column_header{description} =
@@ -1864,20 +1868,20 @@ sub list_buchungsgruppe {
     if ($row) {
       my $pref = $form->{ALL}->[$row - 1];
       $column_data{up} =
-        qq|<td align="center" valign="center">| .
+        qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}id1=$ref->{id}&id2=$pref->{id}">| .
         qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
         qq|</a></td>|;
     } else {
-      $column_data{up} = qq|<td>&nbsp;</td>|;
+      $column_data{up} = qq|<td width="16">&nbsp;</td>|;
     }
 
     if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
-      $column_data{down} = qq|<td>&nbsp;</td>|;
+      $column_data{down} = qq|<td width="16">&nbsp;</td>|;
     } else {
       my $nref = $form->{ALL}->[$row + 1];
       $column_data{down} =
-        qq|<td align="center" valign="center">| .
+        qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}id1=$ref->{id}&id2=$nref->{id}">| .
         qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
         qq|</a></td>|;
@@ -2367,11 +2371,11 @@ sub list_payment {
                      terms_skonto percent_skonto);
 
   $column_header{up} =
-      qq|<th class="listheading" align="center" valign="center">|
+      qq|<th class="listheading" align="center" valign="center" width="16">|
     . qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">|
     . qq|</th>|;
   $column_header{down} =
-      qq|<th class="listheading" align="center" valign="center">|
+      qq|<th class="listheading" align="center" valign="center" width="16">|
     . qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">|
     . qq|</th>|;
   $column_header{description} =
@@ -2432,20 +2436,20 @@ sub list_payment {
     if ($row) {
       my $pref = $form->{ALL}->[$row - 1];
       $column_data{up} =
-        qq|<td align="center" valign="center">| .
+        qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}&id1=$ref->{id}&id2=$pref->{id}">| .
         qq|<img src="image/up.png" alt="| . $locale->text("up") . qq|">| .
         qq|</a></td>|;
     } else {
-      $column_data{up} = qq|<td>&nbsp;</td>|;
+      $column_data{up} = qq|<td width="16">&nbsp;</td>|;
     }
 
     if ($row == (scalar(@{ $form->{ALL} }) - 1)) {
-      $column_data{down} = qq|<td>&nbsp;</td>|;
+      $column_data{down} = qq|<td width="16">&nbsp;</td>|;
     } else {
       my $nref = $form->{ALL}->[$row + 1];
       $column_data{down} =
-        qq|<td align="center" valign="center">| .
+        qq|<td align="center" valign="center" width="16">| .
         qq|<a href="${swap_link}&id1=$ref->{id}&id2=$nref->{id}">| .
         qq|<img src="image/down.png" alt="| . $locale->text("down") . qq|">| .
         qq|</a></td>|;
@@ -3040,19 +3044,6 @@ sub config {
   }
   $countrycodes = "<option>American English\n$countrycodes";
 
-  # use an other input number format than output numberformat
-  # look at Form.pm, sub parse_amount
-  my $in_numberformat = '';
-  $text1 = qq|value="0">| . $locale->text('equal Outputformat');
-  $text2 = qq|value="1">| . $locale->text('1000,00 or 1000.00');
-  @in_nf = ($text1, $text2);
-  foreach $item (@in_nf) {
-    $in_numberformat .=
-      (substr($item, 7, 1) eq $myconfig{in_numberformat})
-      ? "<option selected $item\n"
-      : "<option $item\n";
-  }
-
   foreach $key (keys %{ $form->{IC} }) {
     foreach $accno (sort keys %{ $form->{IC}{$key} }) {
       $myconfig{$key} .=
@@ -3147,10 +3138,6 @@ sub config {
          <th align=right>| . $locale->text('Output Number Format') . qq|</th>
          <td><select name=numberformat>$numberformat</select></td>
        </tr>
-       <tr>
-         <th align=right>| . $locale->text('Input Number Format') . qq|</th>
-         <td><select name=in_numberformat>$in_numberformat</select></td>
-       </tr>
 
        <tr>
          <th align=right>| . $locale->text('Dropdown Limit') . qq|</th>
@@ -3686,7 +3673,7 @@ sub edit_units {
   }
   my $i = 1;
   foreach (@unit_list) {
-    $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"}, 5) if ($_->{"factor"});
+    $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"} * 1) if ($_->{"factor"});
     $_->{"UNITLANGUAGES"} = [];
     foreach my $lang (@languages) {
       push(@{ $_->{"UNITLANGUAGES"} },