Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision fa51a82e

Von Bernd Bleßmann vor etwa 2 Jahren hinzugefügt

  • ID fa51a82ea786778381336cb2b45921eb595df78a
  • Vorgänger 7968fc16
  • Nachfolger d641058f

Angebot/Auftrag Status: Im Bericht anzeigen und danach filtern können.

Unterschiede anzeigen:

bin/mozilla/oe.pl
970 970
  $form->get_lists("projects"     => { "key" => "ALL_PROJECTS", "all" => 1 },
971 971
                   "taxzones"     => "ALL_TAXZONES",
972 972
                   "business_types" => "ALL_BUSINESS_TYPES",);
973
  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
974
  $form->{ALL_DEPARTMENTS} = SL::DB::Manager::Department->get_all;
973
  $form->{ALL_EMPLOYEES}      = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
974
  $form->{ALL_DEPARTMENTS}    = SL::DB::Manager::Department->get_all;
975
  $form->{ALL_ORDER_STATUSES} = SL::DB::Manager::OrderStatus->get_all_sorted;
975 976

  
976 977
  $form->{CT_CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'CT');
977 978
  ($form->{CT_CUSTOM_VARIABLES_FILTER_CODE},
......
1054 1055
    "country",                 "shippingpoint",
1055 1056
    "taxzone",                 "insertdate",
1056 1057
    "order_probability",       "expected_billing_date", "expected_netamount",
1057
    "payment_terms",           "intnotes",
1058
    "payment_terms",           "intnotes",              "order_status",
1058 1059
  );
1059 1060

  
1060 1061
  # only show checkboxes if gotten here via sales_order form.
......
1103 1104
                                                        reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive
1104 1105
                                                        business_id shippingpoint taxzone_id reqdate_unset_or_old insertdatefrom insertdateto
1105 1106
                                                        order_probability_op order_probability_value expected_billing_date_from expected_billing_date_to
1106
                                                        parts_partnumber parts_description all department_id intnotes phone_notes fulltext);
1107
                                                        parts_partnumber parts_description all department_id intnotes phone_notes fulltext order_status_id);
1107 1108
  push @hidden_variables, map { "cvar_$_->{name}" } @ct_searchable_custom_variables;
1108 1109

  
1109 1110
  my   @keys_for_url = grep { $form->{$_} } @hidden_variables;
......
1149 1150
    'expected_netamount'      => { 'text' => $locale->text('Exp. netamount'), },
1150 1151
    'payment_terms'           => { 'text' => $locale->text('Payment Terms'), },
1151 1152
    'intnotes'                => { 'text' => $locale->text('Internal Notes'), },
1153
    'order_status'            => { 'text' => $locale->text('Status'), },
1152 1154
    %column_defs_cvars,
1153 1155
  );
1154 1156

  
1155
  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department intnotes)) {
1157
  foreach my $name (qw(id transdate reqdate quonumber ordnumber cusordnumber name employee salesman shipvia transaction_description shippingpoint taxzone insertdate payment_terms department intnotes order_status)) {
1156 1158
    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
1157 1159
    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
1158 1160
  }
......
1235 1237
    push @options, $locale->text('Bis')  . " " . $locale->date(\%myconfig, $form->{expected_billing_date_to},   1) if $form->{expected_billing_date_to};
1236 1238
  }
1237 1239

  
1240
  if ($form->{order_status_id}) {
1241
    push @options, $locale->text('Status') . " : " . SL::DB::OrderStatus->new(id => $form->{order_status_id})->load->name;
1242
  }
1243

  
1238 1244
  $report->set_options('top_info_text'        => join("\n", @options),
1239 1245
                       'raw_top_info_text'    => $form->parse_html_template('oe/orders_top'),
1240 1246
                       'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom'),

Auch abrufbar als: Unified diff