From: Sven Schöling Date: Tue, 10 Jan 2012 10:13:49 +0000 (+0100) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-2.7.0beta1~73^2 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=fca2825c79e6740fd511a2f86df9cb1ff898bfdf;hp=fef43fa5867d3389a5e967dd758545b7a3904f00;p=kivitendo-erp.git Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- diff --git a/SL/Form.pm b/SL/Form.pm index 0c291dabe..58b1973aa 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -1106,9 +1106,9 @@ sub parse_template { close $temp_fh; if ($template->uses_temp_file() || $self->{media} eq 'email') { - $out = $self->{OUT}; - $out_mode = $self->{OUT_MODE} || '>'; - $self->{OUT} = "$self->{tmpfile}"; + $out = $self->{OUT}; + $out_mode = $self->{OUT_MODE} || '>'; + $self->{OUT} = "$self->{tmpfile}"; $self->{OUT_MODE} = '>'; } @@ -1154,19 +1154,15 @@ sub parse_template { # if we send html or plain text inline if (($self->{format} eq 'html') && ($self->{sendmode} eq 'inline')) { - $mail->{contenttype} = "text/html"; - - $mail->{message} =~ s/\r//g; - $mail->{message} =~ s/\n/
\n/g; - $myconfig->{signature} =~ s/\n/
\n/g; - $mail->{message} .= "
\n--
\n$myconfig->{signature}\n
"; + $mail->{contenttype} = "text/html"; + $mail->{message} =~ s/\r//g; + $mail->{message} =~ s/\n/
\n/g; + $myconfig->{signature} =~ s/\n/
\n/g; + $mail->{message} .= "
\n--
\n$myconfig->{signature}\n
"; open(IN, "<", $self->{tmpfile}) or $self->error($self->cleanup . "$self->{tmpfile} : $!"); - while () { - $mail->{message} .= $_; - } - + $mail->{message} .= $_ while ; close(IN); } else { @@ -1203,10 +1199,10 @@ sub parse_template { #print(STDERR "OUT $self->{OUT}\n"); for my $i (1 .. $self->{copies}) { if ($self->{OUT}) { - open OUT, $self->{OUT_MODE}, $self->{OUT} or $self->error($self->cleanup . "$self->{OUT} : $!"); + open OUT, $self->{OUT_MODE}, $self->{OUT} or $self->error($self->cleanup . "$self->{OUT} : $!"); print OUT $_ while ; close OUT; - seek IN, 0, 0; + seek IN, 0, 0; } else { $self->{attachment_filename} = ($self->{attachment_filename}) diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 18058437f..7627da1cf 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -1517,7 +1517,6 @@ sub print_form { delete $form->{OUT}; if ($form->{media} eq 'printer') { - #$form->{OUT} = "| $form->{printer_command} &>/dev/null"; $form->{OUT} = $form->{printer_command}; $form->{OUT_MODE} = '|-'; $form->{printed} .= " $form->{formname}"; diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 59479931f..29012eb94 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -318,7 +318,7 @@ sub form_header { # openclosed checkboxes my @tmp; push @tmp, sprintf qq||, - $form->{"delivered"} ? "checked" : "", $locale->text('Delivered') if $form->{"type"} =~ /_order$/; + $form->{"delivered"} ? "checked" : "", $locale->text('Delivery Order created') if $form->{"type"} =~ /_order$/; push @tmp, sprintf qq||, $form->{"closed"} ? "checked" : "", $locale->text('Closed') if $form->{id}; $TMPL_VAR{openclosed} = sprintf qq|%s\n|, 2 * scalar @tmp, join "\n", @tmp if @tmp; @@ -833,7 +833,7 @@ sub orders { 'globalprojectnumber' => { 'text' => $locale->text('Project Number'), }, 'transaction_description' => { 'text' => $locale->text('Transaction description'), }, 'open' => { 'text' => $locale->text('Open'), }, - 'delivered' => { 'text' => $locale->text('Delivered'), }, + 'delivered' => { 'text' => $locale->text('Delivery Order created'), }, 'marge_total' => { 'text' => $locale->text('Ertrag'), }, 'marge_percent' => { 'text' => $locale->text('Ertrag prozentual'), }, 'vcnumber' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer Number') : $locale->text('Vendor Number'), }, @@ -879,7 +879,7 @@ sub orders { }; push @options, $locale->text('Open') if $form->{open}; push @options, $locale->text('Closed') if $form->{closed}; - push @options, $locale->text('Delivered') if $form->{delivered}; + push @options, $locale->text('Delivery Order created') if $form->{delivered}; push @options, $locale->text('Not delivered') if $form->{notdelivered}; push @options, $locale->text('Periodic invoices active') if $form->{periodic_invoices_actibe}; diff --git a/locale/de/all b/locale/de/all index 555be1e07..c4ec6b015 100644 --- a/locale/de/all +++ b/locale/de/all @@ -574,6 +574,7 @@ $self->{texts} = { 'Delivered' => 'Geliefert', 'Delivery Date' => 'Lieferdatum', 'Delivery Order' => 'Lieferschein', + 'Delivery Order created' => 'Lieferschein erstellt', 'Delivery Order Date' => 'Lieferscheindatum', 'Delivery Order Date missing!' => 'Lieferscheindatum fehlt!', 'Delivery Order Number' => 'Lieferscheinnummer', diff --git a/locale/de_DE/all b/locale/de_DE/all index 365799921..6ab32d51a 100644 --- a/locale/de_DE/all +++ b/locale/de_DE/all @@ -539,6 +539,7 @@ $self->{texts} = { 'Delivered' => 'Geliefert', 'Delivery Date' => 'Lieferdatum', 'Delivery Order' => 'Lieferschein', + 'Delivery Order created' => 'Lieferschein erstellt', 'Delivery Order Date' => 'Lieferscheindatum', 'Delivery Order Date missing!' => 'Lieferscheindatum fehlt!', 'Delivery Order Number' => 'Lieferscheinnummer', diff --git a/templates/webpages/admin/list_users.html b/templates/webpages/admin/list_users.html index eb55dc51c..2e6228fb9 100644 --- a/templates/webpages/admin/list_users.html +++ b/templates/webpages/admin/list_users.html @@ -40,8 +40,8 @@ - + [% IF LOCKED %] [% ELSE %] diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html index 788a1a283..22d83b017 100644 --- a/templates/webpages/oe/search.html +++ b/templates/webpages/oe/search.html @@ -148,7 +148,7 @@ - + [%- END %]