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:

bin/mozilla/oe.pl
847 847
    "marge_total",             "marge_percent",
848 848
    "vcnumber",                "ustid",
849 849
    "country",                 "shippingpoint",
850
    "taxzone",
850
    "taxzone",                 "insertdate",
851 851
    "order_probability",       "expected_billing_date", "expected_netamount",
852 852
  );
853 853

  
......
889 889
  push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber cusordnumber
890 890
                                                        transaction_description transdatefrom transdateto type vc employee_id salesman_id
891 891
                                                        reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive
892
                                                        business_id shippingpoint taxzone_id reqdate_unset_or_old
892
                                                        business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto
893 893
                                                        order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to);
894 894

  
895 895
  my   @keys_for_url = grep { $form->{$_} } @hidden_variables;
......
928 928
    'periodic_invoices'       => { 'text' => $locale->text('Per. Inv.'), },
929 929
    'shippingpoint'           => { 'text' => $locale->text('Shipping Point'), },
930 930
    'taxzone'                 => { 'text' => $locale->text('Steuersatz'), },
931
    'insertdate'              => { 'text' => $locale->text('Insert Date'), },
931 932
    'order_probability'       => { 'text' => $locale->text('Order probability'), },
932 933
    'expected_billing_date'   => { 'text' => $locale->text('Exp. bill. date'), },
933 934
    'expected_netamount'      => { 'text' => $locale->text('Exp. netamount'), },
934 935
  );
935 936

  
936
  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone)) {
937
  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate)) {
937 938
    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
938 939
    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
939 940
  }
......
971 972
    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1)       if $form->{reqdatefrom};
972 973
    push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{reqdateto},   1)       if $form->{reqdateto};
973 974
  };
975
  if ( $form->{insertdatefrom} or $form->{insertdateto} ) {
976
    push @options, $locale->text('Insert Date');
977
    push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{insertdatefrom}, 1)    if $form->{insertdatefrom};
978
    push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{insertdateto},   1)    if $form->{insertdateto};
979
  };
974 980
  push @options, $locale->text('Open')                                                                    if $form->{open};
975 981
  push @options, $locale->text('Closed')                                                                  if $form->{closed};
976 982
  push @options, $locale->text('Delivery Order created')                                                               if $form->{delivered};

Auch abrufbar als: Unified diff