Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision cff1389b

Von Moritz Bunkus vor mehr als 9 Jahren hinzugefügt

  • ID cff1389b37e5adfde7734718a02290421aa1bf9a
  • Vorgänger 6c7fdf43
  • Nachfolger 1ac4c07d

Rechnungssuche: optionale Spalte Mahnstufe implementiert

Unterschiede anzeigen:

SL/AR.pm
467 467
    qq|  c.id as customer_id, | .
468 468
    qq|  e.name AS employee, | .
469 469
    qq|  e2.name AS salesman, | .
470
    qq|  dc.dunning_description, | .
470 471
    qq|  tz.description AS taxzone, | .
471 472
    qq|  pt.description AS payment_terms, | .
472 473
    qq{  ( SELECT ch.accno || ' -- ' || ch.description
......
481 482
    qq|LEFT JOIN contacts cp ON (a.cp_id = cp.cp_id) | .
482 483
    qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
483 484
    qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
485
    qq|LEFT JOIN dunning_config dc ON (a.dunning_config_id = dc.id) | .
484 486
    qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
485 487
    qq|LEFT JOIN tax_zones tz ON (tz.id = a.taxzone_id)| .
486 488
    qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)| .
bin/mozilla/ar.pl
922 922
  @columns =
923 923
    qw(transdate id type invnumber ordnumber cusordnumber name netamount tax amount paid
924 924
       datepaid due duedate transaction_description notes salesman employee shippingpoint shipvia
925
       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts customertype direct_debit);
925
       marge_total marge_percent globalprojectnumber customernumber country ustid taxzone payment_terms charts customertype direct_debit dunning_description);
926 926

  
927 927
  my $ct_cvar_configs                 = CVar->get_configs('module' => 'CT');
928 928
  my @ct_includeable_custom_variables = grep { $_->{includeable} } @{ $ct_cvar_configs };
......
969 969
    'charts'                  => { 'text' => $locale->text('Buchungskonto'), },
970 970
    'customertype'            => { 'text' => $locale->text('Customer type'), },
971 971
    'direct_debit'            => { 'text' => $locale->text('direct debit'), },
972
    dunning_description       => { 'text' => $locale->text('Dunning level'), },
972 973
    %column_defs_cvars,
973 974
  );
974 975

  
locale/de/all
964 964
  'Dunning Level missing in row ' => 'Mahnlevel fehlt in ',
965 965
  'Dunning Process Config saved!' => 'Mahnwesenkonfiguration gespeichert!',
966 966
  'Dunning Process started for selected invoices!' => 'Mahnprozess für selektierte Rechnungen gestartet',
967
  'Dunning level'               => 'Mahnstufe',
967 968
  'Dunning number'              => 'Mahnungsnummer',
968 969
  'Dunning overview'            => 'Mahnungsübersicht',
969 970
  'Dunning status'              => 'Mahnstatus',
templates/webpages/ar/search.html
214 214
           <td nowrap>[% 'Document Project Number' | $T8 %]</td>
215 215
           <td align=right><input name="l_transaction_description" id="l_transaction_description" class=checkbox type=checkbox value=Y[% IF INSTANCE_CONF.get_require_transaction_description_ps %] checked[% END %]></td>
216 216
           <td nowrap>[% 'Transaction description' | $T8 %]</td>
217
           <td align=right><input name="l_dunning_description" id="l_dunning_description" class=checkbox type=checkbox value=Y></td>
218
           <td nowrap>[% 'Dunning level' | $T8 %]</td>
217 219
          </tr>
218 220
          <tr>
219 221
           <td align=right><input name="l_taxzone" id="l_taxzone" class=checkbox type=checkbox value=Y></td>

Auch abrufbar als: Unified diff