X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdn.pl;h=627f6963340f74c548de25cc519839ecc22383fd;hb=eb8ba4764dff48ed8e67a00c48d02c9e7c6e5de5;hp=063f9da4f96a403a01f080015a3b3dceee71cd3e;hpb=3a94f4d2dd9a835d4a7007e1b999ea00b3c4e1cd;p=kivitendo-erp.git diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 063f9da4f..627f69633 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -133,6 +133,10 @@ sub show_invoices { map { $_->{SELECTED} = $_->{id} == $row->{next_dunning_config_id} } @{ $row->{DUNNING_CONFIG } }; } map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount open_amount fee interest); + + if ($row->{'language_id'}) { + $row->{language} = SL::DB::Manager::Language->find_by_or_create('id' => $row->{'language_id'})->{'description'}; + } } $form->get_lists('printers' => 'printers', @@ -150,6 +154,8 @@ sub show_invoices { 'no_opendocument' => 1,); $form->header(); + $form->{onload} = "document.getElementsByName('language_id')[0].disabled = + !document.getElementsByName('force_lang')[0].checked;"; print $form->parse_html_template("dunning/show_invoices"); $main::lxdebug->leave_sub(); @@ -199,6 +205,8 @@ sub save_dunning { my @rows = (); undef($form->{DUNNING_PDFS}); + my $saved_language_id = $form->{language_id}; + if ($form->{groupinvoices}) { my %dunnings_for; @@ -214,6 +222,7 @@ sub save_dunning { push @{ $level }, { "row" => $i, "invoice_id" => $form->{"inv_id_$i"}, "customer_id" => $form->{"customer_id_$i"}, + "language_id" => $form->{"language_id_$i"}, "next_dunning_config_id" => $form->{"next_dunning_config_id_$i"}, "email" => $form->{"email_$i"}, }; } @@ -221,7 +230,9 @@ sub save_dunning { foreach my $levels (values %dunnings_for) { foreach my $level (values %{ $levels }) { next unless scalar @{ $level }; - + if (!$form->{force_lang}) { + $form->{language_id} = @{$level}[0]->{language_id}; + } DN->save_dunning(\%myconfig, $form, $level); } } @@ -233,12 +244,18 @@ sub save_dunning { my $level = [ { "row" => $i, "invoice_id" => $form->{"inv_id_$i"}, "customer_id" => $form->{"customer_id_$i"}, + "language_id" => $form->{"language_id_$i"}, "next_dunning_config_id" => $form->{"next_dunning_config_id_$i"}, "email" => $form->{"email_$i"}, } ]; + if (!$form->{force_lang}) { + $form->{language_id} = @{$level}[0]->{language_id}; + } DN->save_dunning(\%myconfig, $form, $level); } } + $form->{language_id} = $saved_language_id; + if($form->{DUNNING_PDFS}) { DN->melt_pdfs(\%myconfig, $form, $form->{copies}); } @@ -284,8 +301,8 @@ sub search { $main::auth->assert('dunning_edit'); $form->get_lists("customers" => "ALL_CUSTOMERS", - "departments" => "ALL_DEPARTMENTS", - "salesmen" => "ALL_SALESMEN"); + "departments" => "ALL_DEPARTMENTS"); + $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); DN->get_config(\%myconfig, \%$form); @@ -296,7 +313,6 @@ sub search { $form->{jsscript} = 1; $form->{title} = $locale->text('Dunnings'); $form->{fokus} = "search.customer"; - $form->{salesman_labels} = sub { $_[0]->{"name"} || $_[0]->{"login"} }; $form->header(); @@ -316,7 +332,7 @@ sub show_dunning { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - my $cgi = $main::cgi; + my $cgi = $::request->{cgi}; $main::auth->assert('dunning_edit'); @@ -352,6 +368,7 @@ sub show_dunning { 'checkbox' => { 'text' => '', 'visible' => 'HTML' }, 'dunning_description' => { 'text' => $locale->text('Dunning Level') }, 'customername' => { 'text' => $locale->text('Customername') }, + 'language' => { 'text' => $locale->text('Language') }, 'invnumber' => { 'text' => $locale->text('Invnumber') }, 'transdate' => { 'text' => $locale->text('Invdate') }, 'duedate' => { 'text' => $locale->text('Invoice Duedate') }, @@ -364,12 +381,12 @@ sub show_dunning { ); $report->set_columns(%column_defs); - $report->set_column_order(qw(checkbox dunning_description customername invnumber transdate + $report->set_column_order(qw(checkbox dunning_description customername language invnumber transdate duedate amount dunning_date dunning_duedate fee interest salesman)); $report->set_sort_indicator($form->{sort}, $form->{sortdir}); - my $edit_url = build_std_url('script=is.pl', 'action=edit', 'callback') . '&id='; - my $print_url = build_std_url('action=print_dunning', 'format=pdf', 'media=screen') . '&dunning_id='; + my $edit_url = sub { build_std_url('script=' . ($_[0]->{invoice} ? 'is' : 'ar') . '.pl', 'action=edit', 'callback') . '&id=' . $::form->escape($_[0]->{id}) }; + my $print_url = sub { build_std_url('action=print_dunning', 'format=pdf', 'media=screen', 'dunning_id='.$_[0]->{dunning_id}, 'language_id=' . $_[0]->{language_id}) }; my $sort_url = build_std_url('action=show_dunning', grep { $form->{$_} } @filter_field_list); foreach my $name (qw(dunning_description customername invnumber transdate duedate dunning_date dunning_duedate salesman)) { @@ -396,6 +413,10 @@ sub show_dunning { $first_row_for_dunning = 1; } + if ($ref->{'language_id'}) { + $ref->{language} = SL::DB::Manager::Language->find_by('id' => $ref->{'language_id'})->{'description'}; + } + my $row = { }; foreach my $column (keys %{ $ref }) { $row->{$column} = { @@ -403,8 +424,9 @@ sub show_dunning { 'align' => $alignment{$column}, - 'link' => ($column eq 'invnumber' ? $edit_url . E($ref->{id}) : - $column eq 'dunning_description' ? $print_url . E($ref->{dunning_id}) : ''), + 'link' => ( $column eq 'invnumber' ? $edit_url->($ref) + : $column eq 'dunning_description' ? $print_url->($ref) + : ''), }; } @@ -415,6 +437,13 @@ sub show_dunning { 'align' => 'center', }; + if ($first_row_for_dunning) { + $row->{language} = {'raw_data' => $cgi->hidden('-name' => "language_id_$i", '-value' => $ref->{language_id}) + . " $ref->{language}" }; + } else { + $row->{language} = { }; + } + push @{ $current_dunning_rows }, $row; $previous_dunning_id = $ref->{dunning_id}; @@ -431,6 +460,8 @@ sub show_dunning { $report->set_options_from_form(); + $form->{onload} = "document.getElementsByName('language_id')[0].disabled = + !document.getElementsByName('force_lang')[0].checked;"; $report->generate_with_headers(); $main::lxdebug->leave_sub(); @@ -447,6 +478,7 @@ sub print_dunning { $form->{rowcount} = 1; $form->{selected_1} = 1; $form->{dunning_id_1} = $form->{dunning_id}; + $form->{language_id_1} = $form->{language_id}; print_multiple(); @@ -465,6 +497,7 @@ sub print_multiple { $form->{title} = $locale->text('Print dunnings'); my @dunning_ids = map { $form->{"dunning_id_$_"} } grep { $form->{"selected_$_"} } (1..$form->{rowcount}); + my @language_ids = map { $form->{"language_id_$_"} } grep { $form->{"selected_$_"} } (1..$form->{rowcount}); if (!scalar @dunning_ids) { $form->error($locale->text('No dunnings have been selected for printing.')); @@ -472,10 +505,17 @@ sub print_multiple { $form->{DUNNING_PDFS} = []; + my $saved_language_id = $form->{language_id}; + my $i = 0; foreach my $dunning_id (@dunning_ids) { + if (!$form->{force_lang}) { + $form->{language_id} = $language_ids[$i]; + } DN->print_invoice_for_fees(\%myconfig, $form, $dunning_id); DN->print_dunning(\%myconfig, $form, $dunning_id); + $i++; } + $form->{language_id} = $saved_language_id; if (scalar @{ $form->{DUNNING_PDFS} }) { $form->{dunning_id} = strftime("%Y%m%d", localtime time);