Berichte Verkaufsrechnungen: Bestellnummer des Kunden anzeigen/danach filtern

diff --git a/SL/AR.pm b/SL/AR.pm
index 3da550d68d7d83e9ea21a6e0f53896a24fea6447..a842b9da5a99e2c1a20765f9b87cb89d0f36444f 100644 (file)
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -488,7 +488,7 @@ sub ar_transactions {
   my @values;
 
   my $query =
   my @values;
 
   my $query =

-    qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.transdate, | .
+    qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.cusordnumber, a.transdate, | .

     qq|  a.duedate, a.netamount, a.amount, a.paid, | .
     qq|  a.invoice, a.datepaid, a.terms, 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.terms, a.notes, a.shipvia, | .
     qq|  a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .


@@ -550,7 +550,7 @@ sub ar_transactions {
     $where .= " AND d.description ILIKE ?";
     push(@values, $department);
   }
     $where .= " AND d.description ILIKE ?";
     push(@values, $department);
   }

-  foreach my $column (qw(invnumber ordnumber notes transaction_description)) {
+  foreach my $column (qw(invnumber ordnumber cusordnumber notes transaction_description)) {

     if ($form->{$column}) {
       $where .= " AND a.$column ILIKE ?";
       push(@values, $form->like($form->{$column}));
     if ($form->{$column}) {
       $where .= " AND a.$column ILIKE ?";
       push(@values, $form->like($form->{$column}));


@@ -603,7 +603,7 @@ sub ar_transactions {
   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 name datepaid employee shippingpoint shipvia transaction_description))) {
+  if (grep({ $_ eq $form->{sort} } qw(id transdate duedate invnumber ordnumber cusordnumber name datepaid employee shippingpoint shipvia transaction_description))) {

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

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index e0ed1e7935bd983f00a7905cd2292011e66a050c..fcd9e83c690d05b3b51b35ee604f016f437ee5a5 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -902,12 +902,12 @@ sub ar_transactions {
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   @columns =
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   @columns =

-    qw(transdate id type invnumber ordnumber name netamount tax amount paid
+    qw(transdate id type invnumber ordnumber cusordnumber 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);
 
   my @hidden_variables = map { "l_${_}" } @columns;
        datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
        marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts customertype);
 
   my @hidden_variables = map { "l_${_}" } @columns;

-  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber transaction_description notes project_id transdatefrom transdateto employee_id salesman_id business_id);
+  push @hidden_variables, "l_subtotal", qw(open closed customer invnumber ordnumber cusordnumber transaction_description notes project_id transdatefrom transdateto employee_id salesman_id business_id);

 
   $href = build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);
 
 
   $href = build_std_url('action=ar_transactions', grep { $form->{$_} } @hidden_variables);
 


@@ -917,6 +917,7 @@ sub ar_transactions {
     'type'                    => { 'text' => $locale->text('Type'), },
     'invnumber'               => { 'text' => $locale->text('Invoice'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },
     'type'                    => { 'text' => $locale->text('Type'), },
     'invnumber'               => { 'text' => $locale->text('Invoice'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },

+    'cusordnumber'            => { 'text' => $locale->text('Customer Order Number'), },

     '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'), },


@@ -943,7 +944,7 @@ sub ar_transactions {
     'customertype'            => { 'text' => $locale->text('Customer type'), },
   );
 
     'customertype'            => { 'text' => $locale->text('Customer type'), },
   );
 

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

     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";
   }


@@ -977,6 +978,9 @@ sub ar_transactions {
   if ($form->{ordnumber}) {
     push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
   }
   if ($form->{ordnumber}) {
     push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
   }

+  if ($form->{cusordnumber}) {
+    push @options, $locale->text('Customer Order Number') . " : $form->{cusordnumber}";
+  }

   if ($form->{notes}) {
     push @options, $locale->text('Notes') . " : $form->{notes}";
   }
   if ($form->{notes}) {
     push @options, $locale->text('Notes') . " : $form->{notes}";
   }

diff --git a/templates/webpages/ar/search.html b/templates/webpages/ar/search.html
index a1f90343c92968bf7e024935e7c0dfa421ed6971..467d4b290f350b65a092faad7db49f36ce7b748f 100644 (file)
--- a/templates/webpages/ar/search.html
+++ b/templates/webpages/ar/search.html
@@ -50,6 +50,10 @@
       <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
       <td colspan=3><input name=ordnumber size=20></td>
      </tr>
       <th align=right nowrap>[% 'Order Number' | $T8 %]</th>
       <td colspan=3><input name=ordnumber size=20></td>
      </tr>

+     <tr>
+      <th align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
+      <td colspan=3><input name="cusordnumber" size="20"></td>
+     </tr>

      <tr>
       <th align="right">[% 'Employee' | $T8 %]</th>
       <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1, style = 'width:250px') %]</td>
      <tr>
       <th align="right">[% 'Employee' | $T8 %]</th>
       <td>[% L.select_tag('employee_id', ALL_EMPLOYEES, title_key = 'safe_name', with_empty = 1, style = 'width:250px') %]</td>


@@ -132,10 +136,12 @@
            <td nowrap>[% 'Invoice Number' | $T8 %]</td>
            <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Order Number' | $T8 %]</td>
            <td nowrap>[% 'Invoice Number' | $T8 %]</td>
            <td align=right><input name="l_ordnumber" class=checkbox type=checkbox value=Y></td>
            <td nowrap>[% 'Order Number' | $T8 %]</td>

-           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
-           <td nowrap>[% 'Invoice Date' | $T8 %]</td>
+           <td align=right><input name="l_cusordnumber" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Customer Order Number' | $T8 %]</td>

           </tr>
           <tr>
           </tr>
           <tr>

+           <td align=right><input name="l_transdate" class=checkbox type=checkbox value=Y checked></td>
+           <td nowrap>[% 'Invoice Date' | $T8 %]</td>

            <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
            <td nowrap>[% 'Customer' | $T8 %]</td>
            <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>
            <td align=right><input name="l_name" class=checkbox type=checkbox value=Y checked></td>
            <td nowrap>[% 'Customer' | $T8 %]</td>
            <td align=right><input name="l_customernumber" class=checkbox type=checkbox value=Y></td>