Lieferantenanezige in Einkaufsrechnungenbericht

diff --git a/SL/AP.pm b/SL/AP.pm
index 50afccb..4187c72 100644 (file)
--- a/SL/AP.pm
+++ b/SL/AP.pm
@@ -397,11 +397,16 @@ sub ap_transactions {
     qq|  a.ordnumber, v.name, a.invoice, a.netamount, a.datepaid, a.notes, | .
     qq|  a.globalproject_id, a.storno, a.storno_id, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
-    qq|  e.name AS employee | .
+    qq|  e.name AS employee, | .
+    qq|  v.vendornumber, v.country, v.ustid, | .
+    qq|  tz.description AS taxzone, | .
+    qq|  pt.description AS payment_terms | .
     qq|FROM ap a | .
     qq|JOIN vendor v ON (a.vendor_id = v.id) | .
     qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
-    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) |;
+    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id) | .
+    qq|LEFT JOIN tax_zones tz ON (tz.id = v.taxzone_id)| .
+    qq|LEFT JOIN payment_terms pt ON (pt.id = v.payment_id)|;
 
   my $where = '';
   my @values;
@@ -761,7 +766,7 @@ sub storno {
 
   # now copy acc_trans entries
   $query = qq|SELECT a.*, c.link FROM acc_trans a LEFT JOIN chart c ON a.chart_id = c.id WHERE a.trans_id = ? ORDER BY a.acc_trans_id|;
-  my $rowref = selectall_hashref_query($form, $dbh, $query, $id); 
+  my $rowref = selectall_hashref_query($form, $dbh, $query, $id);
 
   # kill all entries containing payments, which are the last 2n rows, of which the last has link =~ /paid/
   while ($rowref->[-1]{link} =~ /paid/) {

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 33d2eee..f23caf2 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1326,6 +1326,23 @@ sub search {
                <td align=right><input name="l_globalprojectnumber" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Project Number') . qq|</td>
              </tr>
+          <tr>
+        <td colspan=4 align=left><b>| . $locale->text('Vendor') . qq| </td>
+          </tr>
+          <tr>
+               <td align=right><input name="l_vendornumber" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('Vendor Number') . qq|</td>
+               <td align=right><input name="l_country" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('Country') . qq|</td>
+               <td align=right><input name="l_ustid" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('USt-IdNr.') . qq|</td>
+               <td align=right><input name="l_taxzone" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('Steuersatz') . qq|</td>
+          </tr>
+          <tr>
+               <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
+               <td nowrap>| . $locale->text('Payment Terms') . qq|</td>
+          </tr>
            </table>
          </td>
        </tr>
@@ -1388,7 +1405,8 @@ sub ap_transactions {
 
   my @columns =
     qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
-       due duedate transaction_description notes employee globalprojectnumber);
+       due duedate transaction_description notes employee globalprojectnumber
+       vendornumber country ustid taxzone payment_terms);
 
   my @hidden_variables = map { "l_${_}" } @columns;
   push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id transdatefrom transdateto);
@@ -1413,6 +1431,11 @@ sub ap_transactions {
     'notes'                   => { 'text' => $locale->text('Notes'), },
     'employee'                => { 'text' => $locale->text('Salesperson'), },
     'globalprojectnumber'     => { 'text' => $locale->text('Project Number'), },
+    'vendornumber'            => { 'text' => $locale->text('Vendor Number'), },
+    'country'                 => { 'text' => $locale->text('Country'), },
+    'ustid'                   => { 'text' => $locale->text('USt-IdNr.'), },
+    'taxzone'                 => { 'text' => $locale->text('Steuersatz'), },
+    'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
   );
 
   foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shippingpoint shipvia transaction_description)) {

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index d5ec4ed..a86668c 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1426,7 +1426,7 @@ sub search {
                <td nowrap>| . $locale->text('Steuersatz') . qq|</td>
           </tr>
           <tr>
-               <td align=right><input name="l_payment" class=checkbox type=checkbox value=Y></td>
+               <td align=right><input name="l_payment_terms" class=checkbox type=checkbox value=Y></td>
                <td nowrap>| . $locale->text('Payment Terms') . qq|</td>
           </tr>
 

diff --git a/locale/de/ap b/locale/de/ap
index f19ea6a..4bf7b37 100644 (file)
--- a/locale/de/ap
+++ b/locale/de/ap
@@ -59,6 +59,7 @@ $self->{texts} = {
   'Contact'                     => 'Kontakt',
   'Continue'                    => 'Weiter',
   'Could not spawn the printer command.' => 'Die Druckanwendung konnte nicht gestartet werden.',
+  'Country'                     => 'Land',
   'Create and edit RFQs'        => 'Lieferantenanfragen erfassen und bearbeiten',
   'Create and edit customers and vendors' => 'Kunden und Lieferanten erfassen und bearbeiten',
   'Create and edit dunnings'    => 'Mahnungen erfassen und bearbeiten',
@@ -179,6 +180,7 @@ $self->{texts} = {
   'Paid'                        => 'bezahlt',
   'Part Number'                 => 'Artikelnummer',
   'Part description'            => 'Artikelbeschreibung',
+  'Payment Terms'               => 'Zahlungskonditionen',
   'Payment date missing!'       => 'Tag der Zahlung fehlt!',
   'Payment posted!'             => 'Zahlung gebucht!',
   'Payments'                    => 'Zahlungsausgänge',
@@ -217,6 +219,7 @@ $self->{texts} = {
   'September'                   => 'September',
   'Skip'                        => 'Überspringen',
   'Source'                      => 'Beleg',
+  'Steuersatz'                  => 'Steuersatz',
   'Storno'                      => 'Storno',
   'Storno (one letter abbreviation)' => 'S',
   'Storno Invoice'              => 'Stornorechnung',
@@ -246,6 +249,7 @@ $self->{texts} = {
   'Transactions, AR transactions, AP transactions' => 'Dialogbuchen, Debitorenrechnungen, Kreditorenrechnungen',
   'Trying to call a sub without a name' => 'Es wurde versucht, eine Unterfunktion ohne Namen aufzurufen.',
   'Type'                        => 'Typ',
+  'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abhängigkeit \'%s\'.',
   'Update'                      => 'Erneuern',
@@ -254,6 +258,7 @@ $self->{texts} = {
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Lieferant',
   'Vendor Invoice'              => 'Einkaufsrechnung',
+  'Vendor Number'               => 'Lieferantennummer',
   'Vendor details'              => 'Lieferantendetails',
   'Vendor missing!'             => 'Lieferant fehlt!',
   'Vendor not on file or locked!' => 'Dieser Lieferant existiert nicht oder ist gesperrt.',