Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 8f1fb2d6

Von Roman Karushka vor fast 15 Jahren hinzugefügt

  • ID 8f1fb2d695599019da043422cc3314b2a3f4fede
  • Vorgänger 88e6dce2
  • Nachfolger 09fe7f33

Neue Funktion: Checkbox fuer Verkaeuferanzeige in Mahnungsberichten.

Unterschiede anzeigen:

SL/DN.pm
618 618
    qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount,
619 619
         ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee,
620 620
         da.interest, dn.dunning_description, da.transdate AS dunning_date,
621
         da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id
621
         da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id,
622
         e2.name AS salesman
622 623
       FROM ar a
623
       JOIN customer ct ON (a.customer_id = ct.id), dunning da
624
       JOIN customer ct ON (a.customer_id = ct.id)
625
       LEFT JOIN employee e2 ON (a.salesman_id = e2.id), dunning da
624 626
       LEFT JOIN dunning_config dn ON (da.dunning_config_id = dn.id)
625 627
       $where
626 628
       ORDER BY $sortorder|;
bin/mozilla/dn.pl
319 319
  $main::auth->assert('dunning_edit');
320 320

  
321 321
  my @filter_field_list = qw(customer_id customer dunning_level department_id invnumber ordnumber
322
                             transdatefrom transdateto dunningfrom dunningto notes showold);
322
                             transdatefrom transdateto dunningfrom dunningto notes showold salesman);
323 323

  
324 324
  report_generator_set_default_sort('customername', 1);
325 325

  
......
360 360
    'interest'            => { 'text' => $locale->text('Interest') },
361 361
  );
362 362

  
363
  if ($form->{l_salesman}) {
364
   # Show salesman column
365
    $column_defs{'salesman'} = ( { 'text' =>  $locale->text('Salesperson') } );
366
  }
367

  
363 368
  $report->set_columns(%column_defs);
364 369
  $report->set_column_order(qw(checkbox dunning_description customername invnumber transdate
365
                               duedate amount dunning_date dunning_duedate fee interest));
370
                               duedate amount dunning_date dunning_duedate fee interest salesman));
366 371
  $report->set_sort_indicator($form->{sort}, $form->{sortdir});
367 372

  
368 373
  my $edit_url  = build_std_url('script=is.pl', 'action=edit', 'callback') . '&id=';
369 374
  my $print_url = build_std_url('action=print_dunning', 'format=pdf', 'media=screen') . '&dunning_id=';
370 375
  my $sort_url  = build_std_url('action=show_dunning', grep { $form->{$_} } @filter_field_list);
371 376

  
372
  foreach my $name (qw(dunning_description customername invnumber transdate duedate dunning_date dunning_duedate)) {
377
  foreach my $name (qw(dunning_description customername invnumber transdate duedate dunning_date dunning_duedate salesman)) {
373 378
    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
374 379
    $column_defs{$name}->{link} = $sort_url . "&sort=$name&sortdir=$sortdir";
375 380
  }
376 381

  
377
  my %alignment = map { $_ => 'right' } qw(transdate duedate amount dunning_date dunning_duedate fee interest);
382
  my %alignment = map { $_ => 'right' } qw(transdate duedate amount dunning_date dunning_duedate fee interest salesman);
378 383

  
379 384
  my ($current_dunning_rows, $previous_dunning_id, $first_row_for_dunning);
380 385

  
locale/de/dn
218 218
  'SAVED FOR DUNNING'           => 'Gespeichert',
219 219
  'SCREENED'                    => 'Angezeigt',
220 220
  'Sales Invoice'               => 'Rechnung',
221
  'Salesperson'                 => 'Verk?ufer/in',
221 222
  'Sales Order'                 => 'Kundenauftrag',
222 223
  'Sales quotation'             => 'Angebot',
223 224
  'Screen'                      => 'Bildschirm',
locale/en/dn
219 219
  'SCREENED'                    => 'SCREENED',
220 220
  'Sales Invoice'               => 'Sales Invoice',
221 221
  'Sales Order'                 => 'Sales Order',
222
  'Salesperson'                 => 'Salesperson',
222 223
  'Sales quotation'             => 'Sales quotation',
223 224
  'Screen'                      => 'Screen',
224 225
  'Select a Customer'           => 'Select a Customer',
templates/webpages/dunning/search_de.html
105 105
      <tr>
106 106
       <th align="right" nowrap>Alte Mahnungen anzeigen</th>
107 107
       <td><input type="checkbox" value="1" name="showold"></td>
108
       <th align="right" nowrap>Verk&auml;ufer anzeigen</th>
109
       <td><input type="checkbox" value="1" name="l_salesman"></td>
108 110
      </tr>
109 111
     </table>
110 112
    </td>

Auch abrufbar als: Unified diff