Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ba8e82fe

Von Bernd Bleßmann vor mehr als 9 Jahren hinzugefügt

  • ID ba8e82fec038819527301ee344d2016f0c83983a
  • Vorgänger 78bf6632
  • Nachfolger 185d9aae

Berichte->Aufträge/Lieferantenaufträge: Zahlungsbedingungen anzeigen

Unterschiede anzeigen:

SL/OE.pm
111 111
    qq|  o.marge_total, o.marge_percent, | .
112 112
    qq|  o.itime::DATE AS insertdate, | .
113 113
    qq|  ex.$rate AS exchangerate, | .
114
    qq|  pt.description AS payment_terms, | .
114 115
    qq|  pr.projectnumber AS globalprojectnumber, | .
115 116
    qq|  e.name AS employee, s.name AS salesman, | .
116 117
    qq|  ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id,  | .
......
125 126
    qq|LEFT JOIN exchangerate ex ON (ex.currency_id = o.currency_id | .
126 127
    qq|  AND ex.transdate = o.transdate) | .
127 128
    qq|LEFT JOIN project pr ON (o.globalproject_id = pr.id) | .
129
    qq|LEFT JOIN payment_terms pt ON (pt.id = o.payment_id)| .
128 130
    qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | .
129 131
    qq|$periodic_invoices_joins | .
130 132
    qq|WHERE (o.quotation = ?) |;
......
307 309
    "shippingpoint"           => "o.shippingpoint",
308 310
    "insertdate"              => "o.itime",
309 311
    "taxzone"                 => "tz.description",
312
    "payment_terms"           => "pt.description",
310 313
  );
311 314
  if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
312 315
    $sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}"  . ", o.itime ${sortdir}";
bin/mozilla/oe.pl
853 853
    "country",                 "shippingpoint",
854 854
    "taxzone",                 "insertdate",
855 855
    "order_probability",       "expected_billing_date", "expected_netamount",
856
    "payment_terms",
856 857
  );
857 858

  
858 859
  # only show checkboxes if gotten here via sales_order form.
......
944 945
    'order_probability'       => { 'text' => $locale->text('Order probability'), },
945 946
    'expected_billing_date'   => { 'text' => $locale->text('Exp. bill. date'), },
946 947
    'expected_netamount'      => { 'text' => $locale->text('Exp. netamount'), },
948
    'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
947 949
    %column_defs_cvars,
948 950
  );
949 951

  
950
  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate)) {
952
  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms)) {
951 953
    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
952 954
    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
953 955
  }
templates/webpages/oe/search.html
281 281
         <input name="l_marge_percent" id="l_marge_percent" class="checkbox" type="checkbox" value="Y">
282 282
         <label for="l_marge_percent">[% 'Ertrag prozentual' | $T8 %]</label>
283 283
        </td>
284
        <td>
285
         <input name="l_payment_terms" id="l_payment_terms" class="checkbox" type="checkbox" value="Y">
286
         <label for="l_payment_terms">[% 'Payment Terms' | $T8 %]</label>
287
        </td>
284 288
       </tr>
285 289
       <tr>
286 290
        <td>

Auch abrufbar als: Unified diff