Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a809ab0a

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

  • ID a809ab0a8e5c2f991ebbad1ccda9f31f1c009c7c
  • Vorgänger 6ea1dd9b
  • Nachfolger e8966d20

Erfassungsdatum bei Auträgen.

In der Maske anzeigen; im Bericht anzeigen und danach filtern.

Conflicts:

SL/OE.pm
bin/mozilla/oe.pl
locale/de/all
templates/webpages/oe/search.html

Übernahme aus Kundenprojekt.

Unterschiede anzeigen:

SL/OE.pm
109 109
    qq|  o.closed, o.delivered, o.quonumber, o.cusordnumber, o.shippingpoint, o.shipvia, | .
110 110
    qq|  o.transaction_description, | .
111 111
    qq|  o.marge_total, o.marge_percent, | .
112
    qq|  o.itime::DATE AS insertdate, | .
112 113
    qq|  ex.$rate AS exchangerate, | .
113 114
    qq|  pr.projectnumber AS globalprojectnumber, | .
114 115
    qq|  e.name AS employee, s.name AS salesman, | .
......
230 231
    push(@values, conv_date($form->{reqdateto}));
231 232
  }
232 233

  
234
  if($form->{insertdatefrom}) {
235
    $query .= qq| AND o.itime::DATE >= ?|;
236
    push(@values, conv_date($form->{insertdatefrom}));
237
  }
238

  
239
  if($form->{insertdateto}) {
240
    $query .= qq| AND o.itime::DATE <= ?|;
241
    push(@values, conv_date($form->{insertdateto}));
242
  }
243

  
233 244
  if ($form->{shippingpoint}) {
234 245
    $query .= qq| AND o.shippingpoint ILIKE ?|;
235 246
    push(@values, '%' . $form->{shippingpoint} . '%');
......
285 296
    "shipvia"                 => "o.shipvia",
286 297
    "transaction_description" => "o.transaction_description",
287 298
    "shippingpoint"           => "o.shippingpoint",
299
    "insertdate"              => "o.itime",
288 300
    "taxzone"                 => "tz.description",
289 301
  );
290 302
  if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
......
889 901
           o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber,
890 902
           d.description AS department, o.payment_id, o.language_id, o.taxzone_id,
891 903
           o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id,
892
           o.globalproject_id, o.delivered, o.transaction_description, o.delivery_term_id
893
           , o.order_probability, o.expected_billing_date
904
           o.globalproject_id, o.delivered, o.transaction_description, o.delivery_term_id,
905
           o.itime::DATE AS insertdate, o.order_probability, o.expected_billing_date
894 906
         FROM oe o
895 907
         JOIN ${vc} cv ON (o.${vc}_id = cv.id)
896 908
         LEFT JOIN employee e ON (o.employee_id = e.id)

Auch abrufbar als: Unified diff