Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 3d3b033b

Von Bernd Bleßmann vor 8 Monaten hinzugefügt

  • ID 3d3b033bfeedf75777cca162c3c90de0e37e02b4
  • Vorgänger 8bc6c3be
  • Nachfolger 8c5fc063

Filter und Anzeige interne Bemerkungen (vom Lieferanten) Bericht Kreditorenbuchungen

interne Bemerkungen lassen sich in Kreditorenbuchungen nicht Speichern - es
werden die Bemerkungen vom Lieferanten angezeigt. Deshalb wird hier auch
danach gesucht und gefiltert.

Aus Kundenprojekt. Inzwischen kann man int. Bemerkungen bei Kreditorenbuchungen
speichern. Anpassungen dafür kommen in den nächsten commits.

Unterschiede anzeigen:

SL/AP.pm
559 559
    qq|  pr.projectnumber AS globalprojectnumber, | .
560 560
    qq|  e.name AS employee, | .
561 561
    qq|  v.vendornumber, v.country, v.ustid, | .
562
    qq|  v.notes AS intnotes, | .
562 563
    qq|  tz.description AS taxzone, | .
563 564
    qq|  pt.description AS payment_terms, | .
564 565
    qq|  department.description AS department, | .
......
662 663
    $where .= " AND a.notes ILIKE ?";
663 664
    push(@values, like($form->{notes}));
664 665
  }
666
  if ($form->{intnotes}) {
667
    $where .= " AND v.notes ILIKE ?";
668
    push(@values, like($form->{intnotes}));
669
  }
665 670
  if ($form->{project_id}) {
666 671
    $where .=
667 672
      qq| AND ((a.globalproject_id = ?) OR EXISTS | .
bin/mozilla/ap.pl
1188 1188

  
1189 1189
  my @columns =
1190 1190
    qw(transdate id type invnumber ordnumber name netamount tax amount paid datepaid
1191
       due duedate transaction_description notes employee globalprojectnumber department
1191
       due duedate transaction_description notes intnotes employee globalprojectnumber department
1192 1192
       vendornumber country ustid taxzone payment_terms charts debit_chart direct_debit
1193 1193
       insertdate items);
1194 1194

  
1195 1195
  my @hidden_variables = map { "l_${_}" } @columns;
1196
  push @hidden_variables, "l_subtotal", qw(open closed vendor invnumber ordnumber transaction_description notes project_id
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 1199
                                           fulltext insertdatefrom insertdateto);
......
1216 1216
    'duedate'                 => { 'text' => $locale->text('Due Date'), },
1217 1217
    'transaction_description' => { 'text' => $locale->text('Transaction description'), },
1218 1218
    'notes'                   => { 'text' => $locale->text('Notes'), },
1219
    'intnotes'                => { 'text' => $locale->text('Internal Notes'), },
1219 1220
    'employee'                => { 'text' => $locale->text('Employee'), },
1220 1221
    'globalprojectnumber'     => { 'text' => $locale->text('Document Project Number'), },
1221 1222
    'department'              => { 'text' => $locale->text('Department'), },
......
1231 1232
    'items'                   => { 'text' => $locale->text('Positions'), },
1232 1233
  );
1233 1234

  
1234
  foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shipvia transaction_description direct_debit department taxzone insertdate)) {
1235
foreach my $name (qw(id transdate duedate invnumber ordnumber name datepaid employee shipvia transaction_description direct_debit department taxzone insertdate intnotes)) {
1235 1236
    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
1236 1237
    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
1237 1238
  }
......
1261 1262
  push @options, $locale->text('Invoice Number')          . " : $form->{invnumber}"                      if ($form->{invnumber});
1262 1263
  push @options, $locale->text('Order Number')            . " : $form->{ordnumber}"                      if ($form->{ordnumber});
1263 1264
  push @options, $locale->text('Notes')                   . " : $form->{notes}"                          if ($form->{notes});
1265
  push @options, $locale->text('Internal Notes')          . " : $form->{intnotes}"                       if $form->{intnotes};
1264 1266
  push @options, $locale->text('Transaction description') . " : $form->{transaction_description}"        if ($form->{transaction_description});
1265 1267
  push @options, $locale->text('Part Description')        . " : $form->{parts_description}"              if $form->{parts_description};
1266 1268
  push @options, $locale->text('Part Number')             . " : $form->{parts_partnumber}"               if $form->{parts_partnumber};
templates/webpages/ap/search.html
47 47
      <th align="right">[% 'Part Description' | $T8 %]</th>
48 48
      <td>[% L.input_tag("parts_description", "", style=style) %]</td>
49 49
     </tr>
50
     <tr>
51
      <th align="right">[% 'Internal Notes' | $T8 %]</th>
52
      <td>[% L.input_tag("intnotes", "", style=style) %]</td>
53
      <th align="right">[% 'Part Number' | $T8 %]</th>
54
      <td>[% L.input_tag("parts_partnumber", "", style=style) %]</td>
55
     </tr>
50 56
     <tr>
51 57
      <th align="right">[% 'Full Text' | $T8 %]</th>
52 58
      <td>[% L.input_tag('fulltext', '', style=style) %]</td>
......
54 60
     <tr>
55 61
      <th align="right">[% 'Project Number' | $T8 %]</th>
56 62
      <td>[% P.project.picker("project_id", project_id, active="both", valid="both", style=style) %]</td>
57
      <th align="right">[% 'Part Number' | $T8 %]</th>
58
      <td>[% L.input_tag("parts_partnumber", "", style=style) %]</td>
59 63
     </tr>
60 64
     <tr>
61 65
      <th align=right nowrap>[% 'Invoice Date' | $T8 %]</th>
......
140 144
          <tr>
141 145
           <td align=right><input name="l_notes" class=checkbox type=checkbox value=Y></td>
142 146
           <td nowrap>[% 'Notes' | $T8 %]</td>
147
           <td align=right><input name="l_intnotes" class=checkbox type=checkbox value=Y></td>
148
           <td nowrap>[% 'Internal Notes' | $T8 %]</td>
143 149
           <td align=right><input name="l_employee" class=checkbox type=checkbox value=Y></td>
144 150
           <td nowrap>[% 'Employee' | $T8 %]</td>
145 151
           <td align=right><input name="l_department" class=checkbox type=checkbox value=Y></td>

Auch abrufbar als: Unified diff