From 0c404f20f1f066a1e6fc9c4bacf4bd70eec719e4 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 28 Jun 2013 09:37:55 +0200 Subject: [PATCH] Nicht mehr verwendete Einstellung $::form->{jsscript} entfernt --- bin/mozilla/acctranscorrections.pl | 1 - bin/mozilla/ap.pl | 4 ---- bin/mozilla/ar.pl | 5 ----- bin/mozilla/ct.pl | 2 -- bin/mozilla/dn.pl | 3 --- bin/mozilla/do.pl | 7 ------- bin/mozilla/fu.pl | 3 --- bin/mozilla/ic.pl | 5 ----- bin/mozilla/ir.pl | 2 -- bin/mozilla/is.pl | 3 --- bin/mozilla/oe.pl | 5 ----- bin/mozilla/sepa.pl | 4 ---- bin/mozilla/vk.pl | 5 ++--- bin/mozilla/wh.pl | 6 ------ 14 files changed, 2 insertions(+), 53 deletions(-) diff --git a/bin/mozilla/acctranscorrections.pl b/bin/mozilla/acctranscorrections.pl index 35185622f..6ee397f41 100644 --- a/bin/mozilla/acctranscorrections.pl +++ b/bin/mozilla/acctranscorrections.pl @@ -14,7 +14,6 @@ sub analyze_filter { my $form = $main::form; my $locale = $main::locale; - $form->{jsscript} = 1; $form->{title} = $locale->text('General ledger corrections'); $form->header(); print $form->parse_html_template('acctranscorrections/analyze_filter'); diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl index ffd94d2b9..4531e99a9 100644 --- a/bin/mozilla/ap.pl +++ b/bin/mozilla/ap.pl @@ -296,8 +296,6 @@ sub form_header { $taxcharts{$item->{id}} = $item; } - $form->{jsscript} = 1; - my $follow_up_vc = $form->{vendor}; $follow_up_vc =~ s/--.*?//; my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)"; @@ -807,14 +805,12 @@ sub search { $form->all_vc(\%myconfig, "vendor", "AP"); $form->{title} = $locale->text('AP Transactions'); - $form->{jsscript} = 1; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, "departments" => "ALL_DEPARTMENTS", "vendors" => "ALL_VC"); # constants and subs for template - $form->{jsscript} = 1; $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $form->header; diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl index c079b4e75..038e59ea1 100644 --- a/bin/mozilla/ar.pl +++ b/bin/mozilla/ar.pl @@ -834,14 +834,10 @@ sub search { my $locale = $main::locale; my $cgi = $::request->{cgi}; - my ($customer, $department); - my ($jsscript, $button1, $button2); - # setup customer selection $form->all_vc(\%myconfig, "customer", "AR"); $form->{title} = $locale->text('AR Transactions'); - $form->{jsscript} = 1; # Auch in Rechnungsübersicht nach Kundentyp filtern - jan $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, @@ -852,7 +848,6 @@ sub search { $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0; # constants and subs for template - $form->{jsscript} = 1; $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $form->header; diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl index 2cc187ee0..0e91cc936 100644 --- a/bin/mozilla/ct.pl +++ b/bin/mozilla/ct.pl @@ -101,7 +101,6 @@ sub search { 'include_prefix' => 'l_', 'include_value' => 'Y'); - $form->{jsscript} = 1; $form->{title} = $form->{IS_CUSTOMER} ? $locale->text('Customers') : $locale->text('Vendors'); $form->header(); @@ -474,7 +473,6 @@ sub form_header { $form->{shipto_label} = \&_shipto_label; $form->{contacts_label} = \&_contacts_label; $form->{taxzone_id} = 0 if !$form->{id}; - $form->{jsscript} = 1; $form->{SHIPTO_ALL} = [ +{ shipto_id => '0', shiptoname => $::locale->text('All') }, @{ $form->{SHIPTO} } ]; $form->{title} = $form->{title_save} diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 79c5c57e2..01658ab10 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -105,7 +105,6 @@ sub add { $form->{SHOW_DEPARTMENT_SELECTION} = $form->{all_departments} && scalar @{ $form->{all_departments} || [] }; $form->{title} = $locale->text('Start Dunning Process'); - $form->{jsscript} = 1; $form->header(); print $form->parse_html_template("dunning/add"); @@ -143,7 +142,6 @@ sub show_invoices { $form->{type} = 'dunning'; $form->{rowcount} = scalar @{ $form->{DUNNINGS} }; - $form->{jsscript} = 1; $form->{callback} ||= build_std_url("action=show_invoices", qw(customer invnumber ordnumber groupinvoices minamount dunning_level notes)); $form->{PRINT_OPTIONS} = print_options('inline' => 1, @@ -307,7 +305,6 @@ sub search { $form->{SHOW_DEPARTMENT_DDBOX} = scalar @{ $form->{ALL_CUSTOMERS} }; $form->{SHOW_DUNNING_LEVELS} = scalar @{ $form->{DUNNING} }; - $form->{jsscript} = 1; $form->{title} = $locale->text('Dunnings'); $form->header(); diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index b8b169f97..d5ad88ba8 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -166,7 +166,6 @@ sub order_links { # retrieve order/quotation $form->{webdav} = $::lx_office_conf{features}->{webdav}; - $form->{jsscript} = 1; my $editing = $form->{id}; @@ -255,9 +254,6 @@ sub form_header { $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; - # use JavaScript Calendar or not - $form->{jsscript} = 1; - my @old_project_ids = ($form->{"globalproject_id"}); map({ push(@old_project_ids, $form->{"project_id_$_"}) if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"})); @@ -460,7 +456,6 @@ sub search { $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} }; - $form->{jsscript} = 1; $form->{title} = $locale->text('Delivery Orders'); $form->header(); @@ -1125,8 +1120,6 @@ sub display_stock_in_form { my %myconfig = %main::myconfig; my $locale = $main::locale; - $form->{jsscript} = 1; - $form->{title} = $locale->text('Stock'); my $part_info = IC->get_basic_part_info('id' => $form->{parts_id}); diff --git a/bin/mozilla/fu.pl b/bin/mozilla/fu.pl index ef80a73cd..8dc5db6ea 100644 --- a/bin/mozilla/fu.pl +++ b/bin/mozilla/fu.pl @@ -99,8 +99,6 @@ sub display_form { $params{trans_id} = $form->{LINKS}->[0]->{trans_id} if (@{ $form->{LINKS} }); $form->{FOLLOW_UPS} = FU->follow_ups(%params); - $form->{jsscript} = 1; - $form->header(no_layout => $::form->{POPUP_MODE}); print $form->parse_html_template('fu/add_edit'); @@ -232,7 +230,6 @@ sub search { $form->get_lists("employees" => "EMPLOYEES"); - $form->{jsscript} = 1; $form->{title} = $locale->text('Follow-Ups'); $form->header(); diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index feb5ba02d..c68fef0ca 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -106,8 +106,6 @@ sub search { $form->{title} = $locale->text($form->{title}); $form->{title} = $locale->text('Assemblies') if ($is_xyz{is_assembly}); - $form->{jsscript} = 1; - $form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'IC'); ($form->{CUSTOM_VARIABLES_FILTER_CODE}, $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES}, @@ -1610,9 +1608,6 @@ sub form_header { flash('info', $::locale->text('This partnumber is not unique. You should change it.')); } - # use JavaScript Calendar or not (yes!) - $form->{jsscript} = 1; - my $units = AM->retrieve_units(\%myconfig, $form); $form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ]; diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index b14ee0df0..b75dafccd 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -102,7 +102,6 @@ sub invoice_links { # create links $form->{webdav} = $::lx_office_conf{features}->{webdav}; - $form->{jsscript} = 1; $form->create_links("AP", \%myconfig, "vendor"); @@ -355,7 +354,6 @@ sub form_header { ), @custom_hiddens, map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; - $form->{jsscript} = 1; $form->header(); print $form->parse_html_template("ir/form_header", \%TMPL_VAR); diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index e9ea9f003..b35e176ba 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -76,8 +76,6 @@ sub add { $form->{callback} = "$form->{script}?action=add&type=$form->{type}" unless $form->{callback}; - $form->{jsscript} = "date"; - &invoice_links; &prepare_invoice; &display_form; @@ -379,7 +377,6 @@ sub form_header { ), @custom_hiddens, map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; - $form->{jsscript} = 1; $form->header(); print $form->parse_html_template("is/form_header", \%TMPL_VAR); diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index ba4b7b456..f2db8f8f4 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -230,7 +230,6 @@ sub order_links { # retrieve order/quotation $form->{webdav} = $::lx_office_conf{features}->{webdav}; - $form->{jsscript} = 1; my $editing = $form->{id}; @@ -318,9 +317,6 @@ sub form_header { $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; - # use JavaScript Calendar or not - $form->{jsscript} = 1; - # openclosed checkboxes my @tmp; push @tmp, sprintf qq||, @@ -725,7 +721,6 @@ sub search { $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); # constants and subs for template - $form->{jsscript} = 1; $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; $form->header(); diff --git a/bin/mozilla/sepa.pl b/bin/mozilla/sepa.pl index 4e2a223e0..2850bfb14 100755 --- a/bin/mozilla/sepa.pl +++ b/bin/mozilla/sepa.pl @@ -127,8 +127,6 @@ sub bank_transfer_create { my $bank_account_label_sub = sub { $locale->text('Account number #1, bank code #2, #3', $_[0]->{account_number}, $_[0]->{bank_code}, $_[0]->{bank}) }; - $form->{jsscript} = 1; - $form->header(); print $form->parse_html_template('sepa/bank_transfer_create', { 'BANK_TRANSFERS' => \@bank_transfers, @@ -169,7 +167,6 @@ sub bank_transfer_search { my $vc = $form->{vc} eq 'customer' ? 'customer' : 'vendor'; $form->{title} = $vc eq 'customer' ? $::locale->text('List of bank collections') : $locale->text('List of bank transfers'); - $form->{jsscript} = 1; $form->header(); print $form->parse_html_template('sepa/bank_transfer_search', { vc => $vc }); @@ -330,7 +327,6 @@ sub bank_transfer_edit { $form->error($locale->text('That export does not exist.')); } - $form->{jsscript} = 1; $form->{title} = $locale->text('View SEPA export'); $form->header(); print $form->parse_html_template('sepa/bank_transfer_edit', diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl index a60d430ea..9206e7e74 100644 --- a/bin/mozilla/vk.pl +++ b/bin/mozilla/vk.pl @@ -61,7 +61,6 @@ sub search_invoice { $form->all_vc(\%myconfig, "customer", "AR"); $form->{title} = $locale->text('Sales Report'); - $form->{jsscript} = 1; $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, "departments" => "ALL_DEPARTMENTS", @@ -104,10 +103,10 @@ sub invoice_transactions { # can't currently be configured from report, empty line between main sortings my $addemptylines = 1; - + # don't add empty lines between mainsort subtotals when only subtotal_mainsort is selected if ($form->{l_subtotal_mainsort} eq "Y" and not defined $form->{l_headers_mainsort} and not defined $form->{l_headers_subsort} and not defined $form->{l_subtotal_subsort} ) { - $addemptylines = 0 + $addemptylines = 0 }; if ( $form->{customer} =~ /--/ ) { diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl index f76b4e969..b8cda2b2c 100644 --- a/bin/mozilla/wh.pl +++ b/bin/mozilla/wh.pl @@ -105,8 +105,6 @@ sub transfer_warehouse_selection { my $content; - $form->{jsscript} = 1; - if ($form->{trans_type} eq 'removal') { $form->{nextsub} = "removal_parts_selection"; $form->{title} = $locale->text('Removal from Warehouse'); @@ -657,8 +655,6 @@ sub journal { show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} }); - $form->{jsscript} = 1; - $form->header(); print $form->parse_html_template("wh/journal_filter", { "UNITS" => AM->unit_select_data(AM->retrieve_units(\%myconfig, $form)) }); @@ -803,8 +799,6 @@ sub report { show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} }); - $form->{jsscript} = 1; - $form->{title} = $locale->text("Report about warehouse contents"); $form->header(); -- 2.20.1