Bugfix:

Verkaeufer und Bearbeiter waren in den Rechnungsberichten durcheinandergekommen.
Sind jetzt getrennt und korrekt in den Berichten einzubinden.

diff --git a/SL/AR.pm b/SL/AR.pm
index 5fc6032a96a63b240c8e047024c46fc80e36151f..0aa4ff372dcd8939703f0cdc7b5d40b6bcb60718 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -416,10 +416,12 @@ sub ar_transactions {
     qq|  a.transaction_description, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  c.name, | .
-    qq|  e.name AS employee | .
+    qq|  e.name AS employee, | .
+    qq|  e2.name AS salesman | .
     qq|FROM ar a | .
     qq|JOIN customer c ON (a.customer_id = c.id) | .
     qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
+    qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
     qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)|;
 
   my $where = "1 = 1";

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 31c9cfff48664ecb9b8cf8edfed27fb17ae0a7ae..c95d0c7fba1ccb1c99ce09288a0421e9837fdaff 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1377,7 +1377,7 @@ sub search {
              <tr>
                <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Notes') . qq|</td>
-               <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
+               <td align=right><input name="l_salesman" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Salesperson') . qq|</td>
                <td align=right><input name="l_shippingpoint" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Shipping Point') . qq|</td>
@@ -1385,10 +1385,12 @@ sub search {
                <td nowrap>| . $locale->text('Ship via') . qq|</td>
              </tr>
              <tr>
-               <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td><td> |
-    .             $locale->text('Ertrag') . qq|</td>
-               <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td><td> |
-    .             $locale->text('Ertrag prozentual') . qq|</td>
+               <td align=right><input name="l_marge_total" class=checkbox type=checkbox value=Y></td>
+                <td nowrap> | . $locale->text('Ertrag') . qq|</td>
+               <td align=right><input name="l_marge_percent" class=checkbox type=checkbox value=Y></td>
+                <td nowrap> | . $locale->text('Ertrag prozentual') . qq|</td>
+               <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('Employee') . qq|</td>
              </tr>
              <tr>
                <td align=right><input name="l_subtotal" class=checkbox type=checkbox value=Y></td>
@@ -1465,7 +1467,7 @@ sub ar_transactions {
 
   @columns =
     qw(transdate id type invnumber ordnumber name netamount tax amount paid
-       datepaid due duedate transaction_description notes employee shippingpoint shipvia
+       datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
        marge_total marge_percent globalprojectnumber);
 
   my @hidden_variables = map { "l_${_}" } @columns;
@@ -1489,7 +1491,8 @@ sub ar_transactions {
     'duedate'                 => { 'text' => $locale->text('Due Date'), },
     'transaction_description' => { 'text' => $locale->text('Transaction description'), },
     'notes'                   => { 'text' => $locale->text('Notes'), },
-    'employee'                => { 'text' => $locale->text('Salesperson'), },
+    'salesman'                => { 'text' => $locale->text('Salesperson'), },
+    'employee'                => { 'text' => $locale->text('Employee'), },
     'shippingpoint'           => { 'text' => $locale->text('Shipping Point'), },
     'shipvia'                 => { 'text' => $locale->text('Ship via'), },
     'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },

diff --git a/locale/de/ar b/locale/de/ar
index 7392fb1aa6ea0c1c25a9479078faece80571678d..a5ab08e475dbf0459961ea0c417321589f21b26d 100644 (file)
--- a/locale/de/ar
+++ b/locale/de/ar
@@ -88,6 +88,7 @@ $self->{texts} = {
   'Dunning'                     => 'Mahnung',
   'ELSE'                        => 'Zusatz',
   'Edit Accounts Receivables Transaction' => 'Debitorenbuchung bearbeiten',
+  'Employee'                    => 'Bearbeiter',
   'Enter longdescription'       => 'Langtext eingeben',
   'Error in database control file \'%s\': %s' => 'Fehler in Datenbankupgradekontrolldatei \'%s\': %s',
   'Ertrag'                      => 'Ertrag',