Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 25bc91e2

Von Werner Hahn vor 16 Tagen hinzugefügt

  • ID 25bc91e280ce67d53b6a8878b30adbff2607b48e
  • Vorgänger 4bc122b8
  • Nachfolger ccf47ba7

EK/VK Rechnungen Kred. Deb. Suche Seriannummer aus Position als Kriterium

Unterschiede anzeigen:

SL/AP.pm
767 767
    push @values, like($form->{parts_description});
768 768
  }
769 769

  
770
  if ($form->{parts_serialnumber}) {
771
    $where .= <<SQL;
772
 AND EXISTS (
773
        SELECT invoice.trans_id
774
        FROM invoice
775
        WHERE (invoice.trans_id = a.id)
776
          AND (invoice.serialnumber ILIKE ?)
777
        LIMIT 1
778
      )
779
SQL
780
    push @values, like($form->{parts_serialnumber});
781
  }
782

  
770 783
  if ($where) {
771 784
    $where  =~ s{\s*AND\s*}{ WHERE };
772 785
    $query .= $where;
SL/AR.pm
717 717
    push @values, like($form->{parts_description});
718 718
  }
719 719

  
720
  if ($form->{parts_serialnumber}) {
721
    $where .= <<SQL;
722
 AND EXISTS (
723
        SELECT invoice.trans_id
724
        FROM invoice
725
        WHERE (invoice.trans_id = a.id)
726
          AND (invoice.serialnumber ILIKE ?)
727
        LIMIT 1
728
      )
729
SQL
730
    push @values, like($form->{parts_serialnumber});
731
  }
732

  
720 733
  if ($form->{show_not_mailed}) {
721 734
    $where .= <<SQL;
722 735
      AND NOT EXISTS (
bin/mozilla/ap.pl
1196 1196
  push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes intnotes project_id
1197 1197
                                           transdatefrom transdateto duedatefrom duedateto datepaidfrom datepaidto
1198 1198
                                           parts_partnumber parts_description department_id taxzone_id payment_id
1199
                                           fulltext insertdatefrom insertdateto);
1199
                                           fulltext insertdatefrom insertdateto
1200
                                           parts_serialnumber);
1200 1201

  
1201 1202
  my $href = build_std_url('action=ap_transactions', grep { $form->{$_} } @hidden_variables);
1202 1203

  
......
1267 1268
  push @options, $locale->text('Part Description')        . " : $form->{parts_description}"              if $form->{parts_description};
1268 1269
  push @options, $locale->text('Part Number')             . " : $form->{parts_partnumber}"               if $form->{parts_partnumber};
1269 1270
  push @options, $locale->text('Full Text')               . " : $form->{fulltext}"                       if ($form->{fulltext});
1271
  push @options, $locale->text('Serial Number')               . " : $form->{parts_serialnumber}"                       if ($form->{parts_serialnumber});
1270 1272
  push @options, $locale->text('From')                                      . " " . $locale->date(\%myconfig, $form->{transdatefrom},  1) if ($form->{transdatefrom});
1271 1273
  push @options, $locale->text('Bis')                                       . " " . $locale->date(\%myconfig, $form->{transdateto},    1) if ($form->{transdateto});
1272 1274
  push @options, $locale->text('Due Date')    . " " . $locale->text('from') . " " . $locale->date(\%myconfig, $form->{duedatefrom},    1) if ($form->{duedatefrom});
bin/mozilla/ar.pl
1154 1154
    business_id parts_partnumber parts_description department_id
1155 1155
    show_marked_as_closed show_not_mailed shippingpoint shipvia taxzone_id
1156 1156
    payment_id shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet
1157
    shiptozipcode shiptocity shiptocountry fulltext
1157
    shiptozipcode shiptocity shiptocountry fulltext parts_serialnumber
1158 1158
  );
1159 1159
  push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
1160 1160

  
......
1334 1334
  if ($form->{fulltext}) {
1335 1335
    push @options, $locale->text('Full Text') . " : $form->{fulltext}";
1336 1336
  }
1337
  if ($form->{parts_serialnumber}) {
1338
    push @options, $locale->text('Serial Number') . " : $form->{parts_serialnumber}";
1339
  }
1337 1340

  
1338 1341
  $form->{ALL_PRINTERS} = SL::DB::Manager::Printer->get_all_sorted;
1339 1342

  
templates/design40_webpages/ap/search.html
83 83
      <th>[% 'Part Number' | $T8 %]</th>
84 84
      <td>[% L.input_tag("parts_partnumber", "", class="wi-normal") %]</td>
85 85
    </tr>
86
    <tr>
87
      <th>[% 'Serial Number' | $T8 %]</th>
88
      <td>[% L.input_tag("parts_serialnumber", "") %]</td>
89
    </tr>
86 90
    <tr>
87 91
      <th>[% 'Project Number' | $T8 %]</th>
88 92
      <td>[% P.project.picker("project_id", project_id, active="both", valid="both", class="wi-normal") %]</td>
templates/design40_webpages/ar/search.html
63 63
          <th>[% 'Part Number' | $T8 %]</th>
64 64
          <td>[% L.input_tag("parts_partnumber", "") %]</td>
65 65
        </tr>
66
        <tr>
67
          <th>[% 'Serial Number' | $T8 %]</th>
68
          <td>[% L.input_tag("parts_serialnumber", "") %]</td>
69
        </tr>
66 70
      </tbody>
67 71
    </table>
68 72

  
templates/webpages/ap/search.html
56 56
     <tr>
57 57
      <th align="right">[% 'Full Text' | $T8 %]</th>
58 58
      <td>[% L.input_tag('fulltext', '', style=style) %]</td>
59
      <th align="right">[% 'Serial Number' | $T8 %]</th>
60
      <td>[% L.input_tag("parts_serialnumber", "", style=style) %]</td>
59 61
     </tr>
60 62
     <tr>
61 63
      <th align="right">[% 'Project Number' | $T8 %]</th>
templates/webpages/ar/search.html
62 62
     <tr>
63 63
      <th align="right">[% 'Full Text' | $T8 %]</th>
64 64
      <td>[% L.input_tag('fulltext', '', style=style) %]</td>
65
      <th align="right">[% 'Serial Number' | $T8 %]</th>
66
      <td>[% L.input_tag("parts_serialnumber", "", style=style) %]</td>
65 67
     </tr>
66 68
     <tr>
67 69
      <th align=right nowrap>[% 'Shipping Point' | $T8 %]</th>

Auch abrufbar als: Unified diff