Zahlungsbedingungen: skonto_in_percent kann verwendet werden.

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

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 27b18e4..a1e227f 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -727,7 +727,7 @@ sub list_department {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
   }
 
@@ -929,7 +929,7 @@ sub list_lead {
   map { print "$column_header{$_}\n" } @column_index;
 
   print qq|
-        </tr>
+  </tr>
 |;
 
   my ($i, %column_data);
@@ -939,17 +939,17 @@ sub list_lead {
     $i %= 2;
 
     print qq|
-        <tr valign=top class=listrow$i>
+  <tr valign=top class=listrow$i>
 |;
 
-#      $lead = $ref->{lead};
+#    $lead = $ref->{lead};
 
     $column_data{description} = qq|<td><a href="am.pl?action=edit_lead&id=$ref->{id}&callback=$callback">$ref->{lead}</td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+  </tr>
 |;
   }
 
@@ -1107,6 +1107,7 @@ sub list_business {
   $form->{title} = $locale->text('Type of Business');
 
   my @column_index = qw(description discount customernumberinit);
+  push @column_index, 'salesman' if $::vertreter;
   my %column_header;
   $column_header{description} =
       qq|<th class=listheading width=60%>|
@@ -1120,6 +1121,10 @@ sub list_business {
       qq|<th class=listheading>|
     . $locale->text('Customernumberinit')
     . qq|</th>|;
+  $column_header{salesman} =
+      qq|<th class=listheading>|
+    . $locale->text('Representative')
+    . qq|</th>|;
 
   $form->header;
 
@@ -1159,11 +1164,12 @@ sub list_business {
     $column_data{discount}           = qq|<td align=right>$discount</td>|;
     $column_data{customernumberinit} =
       qq|<td align=right>$ref->{customernumberinit}</td>|;
+    $column_data{salesman} = '<td>' . ($ref->{salesman} ? $::locale->text('Yes') : $::locale->text('No')) . '</td>';
 
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
   }
 
@@ -1213,6 +1219,18 @@ sub business_header {
   $form->{discount} =
     $form->format_amount(\%myconfig, $form->{discount} * 100);
 
+  my $salesman_code;
+  if ($::vertreter) {
+    $salesman_code = qq|
+  <tr>
+    <th align="right">| . $locale->text('Representative') . qq|</th>
+    <td>| . $::cgi->checkbox(-name => "salesman", -value => 1, -label => '', 'checked' => $form->{salesman} ? 1 : 0) . qq|</td>
+  </tr>
+|;
+  } else {
+    $salesman_code = $::cgi->hidden(-name => 'salesman', -value => $form->{salesman} ? 1 : 0);
+  }
+
   $form->header;
 
   print qq|
@@ -1240,6 +1258,7 @@ sub business_header {
     <th align=right>| . $locale->text('Customernumberinit') . qq|</th>
     <td><input name=customernumberinit size=10 value=$form->{customernumberinit}></td>
   </tr>
+$salesman_code
   <td colspan=2><hr size=3 noshade></td>
   </tr>
 </table>
@@ -1417,7 +1436,7 @@ sub list_language {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
   }
 
@@ -1769,7 +1788,7 @@ sub list_buchungsgruppe {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
 
     $row++;
@@ -1853,10 +1872,10 @@ sub buchungsgruppe_header {
   if (!$main::eur) {
     $linkaccounts = qq|
                <tr>
-               <th align=right>| . $locale->text('Inventory') . qq|</th>
-               <td><select name=inventory_accno_id>$form->{selectIC}</select></td>
-               <input name=selectIC type=hidden value="$form->{selectIC}">
-             </tr>|;
+                <th align=right>| . $locale->text('Inventory') . qq|</th>
+                <td><select name=inventory_accno_id>$form->{selectIC}</select></td>
+                <input name=selectIC type=hidden value="$form->{selectIC}">
+              </tr>|;
   } else {
     $linkaccounts = qq|
                 <input type=hidden name=inventory_accno_id value=$form->{inventory_accno_id}>|;
@@ -1864,28 +1883,28 @@ sub buchungsgruppe_header {
 
 
   $linkaccounts .= qq|
-             <tr>
-               <th align=right>| . $locale->text('National Revenues') . qq|</th>
-               <td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('National Expenses') . qq|</th>
-               <td><select name=expense_accno_id_0>$form->{selectIC_expense}</select></td>
-             </tr>|;
+              <tr>
+                <th align=right>| . $locale->text('National Revenues') . qq|</th>
+                <td><select name=income_accno_id_0>$form->{selectIC_income}</select></td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('National Expenses') . qq|</th>
+                <td><select name=expense_accno_id_0>$form->{selectIC_expense}</select></td>
+              </tr>|;
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
     $form->{selectIC_income} =~ s/ value=\Q$form->{income_accno_id_1}\E/  value=$form->{income_accno_id_1} selected/;
     $form->{selectIC_expense} =~ s/selected//g;
     $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_1}\E/  value=$form->{expense_accno_id_1} selected/;
   }
-  $linkaccounts .= qq|       <tr>
-               <th align=right>| . $locale->text('Revenues EU with UStId') . qq|</th>
-               <td><select name=income_accno_id_1>$form->{selectIC_income}</select></td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('Expenses EU with UStId') . qq|</th>
-               <td><select name=expense_accno_id_1>$form->{selectIC_expense}</select></td>
-             </tr>|;
+  $linkaccounts .= qq|              <tr>
+                <th align=right>| . $locale->text('Revenues EU with UStId') . qq|</th>
+                <td><select name=income_accno_id_1>$form->{selectIC_income}</select></td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Expenses EU with UStId') . qq|</th>
+                <td><select name=expense_accno_id_1>$form->{selectIC_expense}</select></td>
+              </tr>|;
 
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
@@ -1894,14 +1913,14 @@ sub buchungsgruppe_header {
     $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_2}\E/  value=$form->{expense_accno_id_2} selected/;
   }
 
-  $linkaccounts .= qq|       <tr>
-               <th align=right>| . $locale->text('Revenues EU without UStId') . qq|</th>
-               <td><select name=income_accno_id_2>$form->{selectIC_income}</select></td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('Expenses EU without UStId') . qq|</th>
-               <td><select name=expense_accno_id_2>$form->{selectIC_expense}</select></td>
-             </tr>|;
+  $linkaccounts .= qq|              <tr>
+                <th align=right>| . $locale->text('Revenues EU without UStId') . qq|</th>
+                <td><select name=income_accno_id_2>$form->{selectIC_income}</select></td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Expenses EU without UStId') . qq|</th>
+                <td><select name=expense_accno_id_2>$form->{selectIC_expense}</select></td>
+              </tr>|;
 
   if ($form->{id}) {
     $form->{selectIC_income} =~ s/selected//g;
@@ -1910,14 +1929,14 @@ sub buchungsgruppe_header {
     $form->{selectIC_expense} =~ s/ value=\Q$form->{expense_accno_id_3}\E/  value=$form->{expense_accno_id_3} selected/;
   }
 
-  $linkaccounts .= qq|       <tr>
-               <th align=right>| . $locale->text('Foreign Revenues') . qq|</th>
-               <td><select name=income_accno_id_3>$form->{selectIC_income}</select></td>
-             </tr>
-             <tr>
-               <th align=right>| . $locale->text('Foreign Expenses') . qq|</th>
-               <td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
-             </tr>
+  $linkaccounts .= qq|              <tr>
+                <th align=right>| . $locale->text('Foreign Revenues') . qq|</th>
+                <td><select name=income_accno_id_3>$form->{selectIC_income}</select></td>
+              </tr>
+              <tr>
+                <th align=right>| . $locale->text('Foreign Expenses') . qq|</th>
+                <td><select name=expense_accno_id_3>$form->{selectIC_expense}</select></td>
+              </tr>
 |;
 
 
@@ -2106,7 +2125,7 @@ sub list_printer {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+        </tr>
 |;
   }
 
@@ -2393,7 +2412,7 @@ sub list_payment {
     map { print "$column_data{$_}\n" } @column_index;
 
     print qq|
-       </tr>
+       </tr>
 |;
     $row++;
   }
@@ -2512,6 +2531,8 @@ sub payment_header {
                         "with discount")
 . qq|</li>
   <li>| . $locale->text("&lt;%skonto_amount%&gt; -- The deductible amount")
+. qq|</li>
+  <li>| . $locale->text("&lt;%skonto_in_percent%&gt; -- The discount in percent")
 . qq|</li>
   <li>| . $locale->text("&lt;%total%&gt; -- Amount payable")
 . qq|</li>
@@ -2724,7 +2745,7 @@ sub config {
   }
 
   $form->{STYLESHEETS} = [];
-  foreach my $item (qw(lx-office-erp.css Win2000.css)) {
+  foreach my $item (qw(lx-office-erp.css Win2000.css Mobile.css)) {
     push @{ $form->{STYLESHEETS} }, {
       'name'     => $item,
       'value'    => $item,
@@ -2787,10 +2808,10 @@ sub audit_control {
   <tr>
     <td>
       <table>
-       <tr>
-         <th>| . $locale->text('Close Books up to') . qq|</th>
-         <td><input name=closedto size=11 title="$myconfig{dateformat}" value=$form->{closedto}></td>
-       </tr>
+        <tr>
+          <th>| . $locale->text('Close Books up to') . qq|</th>
+          <td><input name=closedto size=11 title="$myconfig{dateformat}" value=$form->{closedto}></td>
+        </tr>
       </table>
     </td>
   </tr>