VK-Rechnungsbericht: Lieferscheinnummer und Lieferdatum anzeigen können

diff --git a/SL/AR.pm b/SL/AR.pm
index b26911af71275f662fa4b3ea46fc5411faa8a777..3d31a61a4188ec9634348771cd5c424cc6c7eb9f 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -481,6 +481,7 @@ sub ar_transactions {
 
   my $query =
     qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.cusordnumber, a.transdate, | .
 
   my $query =
     qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.cusordnumber, a.transdate, | .

+    qq|  a.donumber, a.deliverydate, | .

     qq|  a.duedate, a.netamount, a.amount, a.paid, | .
     qq|  a.invoice, a.datepaid, a.notes, a.shipvia, | .
     qq|  a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .
     qq|  a.duedate, a.netamount, a.amount, a.paid, | .
     qq|  a.invoice, a.datepaid, a.notes, a.shipvia, | .
     qq|  a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .


@@ -682,7 +683,7 @@ SQL
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
   my $sortorder = join(', ', map { "$_ $sortdir" } @a);
 
   my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
   my $sortorder = join(', ', map { "$_ $sortdir" } @a);
 

-  if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description department))) {
+  if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description department))) {

     $sortorder = $form->{sort} . " $sortdir";
   }
 
     $sortorder = $form->{sort} . " $sortdir";
   }
 

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 8d49a5051751860ed17e6c8f21385e99ab17dd75..51fbb1aa1cccb29cefd89b28947a102bf28d33c5 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1010,7 +1010,7 @@ sub ar_transactions {
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   @columns =
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   @columns =

-    qw(ids transdate id type invnumber ordnumber cusordnumber name netamount tax amount paid
+    qw(ids transdate id type invnumber ordnumber cusordnumber donumber deliverydate name netamount tax amount paid

        datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
        marge_total marge_percent globalprojectnumber customernumber country ustid taxzone
        payment_terms charts customertype direct_debit dunning_description department);
        datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
        marge_total marge_percent globalprojectnumber customernumber country ustid taxzone
        payment_terms charts customertype direct_debit dunning_description department);


@@ -1037,6 +1037,8 @@ sub ar_transactions {
     'invnumber'               => { 'text' => $locale->text('Invoice'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },
     'cusordnumber'            => { 'text' => $locale->text('Customer Order Number'), },
     'invnumber'               => { 'text' => $locale->text('Invoice'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },
     'cusordnumber'            => { 'text' => $locale->text('Customer Order Number'), },

+    'donumber'                => { 'text' => $locale->text('Delivery Order'), },
+    'deliverydate'            => { 'text' => $locale->text('Delivery Date'), },

     'name'                    => { 'text' => $locale->text('Customer'), },
     'netamount'               => { 'text' => $locale->text('Amount'), },
     'tax'                     => { 'text' => $locale->text('Tax'), },
     'name'                    => { 'text' => $locale->text('Customer'), },
     'netamount'               => { 'text' => $locale->text('Amount'), },
     'tax'                     => { 'text' => $locale->text('Tax'), },


@@ -1067,7 +1069,7 @@ sub ar_transactions {
     %column_defs_cvars,
   );
 
     %column_defs_cvars,
   );
 

-  foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) {
+  foreach my $name (qw(id transdate duedate invnumber ordnumber cusordnumber donumber deliverydate name datepaid employee shippingpoint shipvia transaction_description direct_debit department)) {

     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }
     my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
     $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
   }

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index 2000b8ca4c172f8b75f9b1214198c2df472638e7..3109bd5259e09fc0ee822b71fc345ebf6c2f0025 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -135,8 +135,12 @@
            <td nowrap>[% 'Customer Number' | $T8 %]</td>
            <td align=right><input name="l_department" id="l_department" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Department' | $T8 %]</td>
            <td nowrap>[% 'Customer Number' | $T8 %]</td>
            <td align=right><input name="l_department" id="l_department" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Department' | $T8 %]</td>

-

           </tr>
           </tr>

+          <tr>
+           <td align=right><input name="l_donumber" id="l_donumber" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Delivery Order Number' | $T8 %]</td>
+           <td align=right><input name="l_deliverydate" id="l_deliverydate" class=checkbox type=checkbox value=Y></td>
+           <td nowrap>[% 'Delivery Date' | $T8 %]</td>

           <tr>
            <td align=right><input name="l_netamount" id="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
            <td nowrap>[% 'Amount' | $T8 %]</td>
           <tr>
            <td align=right><input name="l_netamount" id="l_netamount" class=checkbox type=checkbox value="Y" checked></td>
            <td nowrap>[% 'Amount' | $T8 %]</td>