From: Moritz Bunkus Date: Wed, 17 Jul 2019 10:17:16 +0000 (+0200) Subject: Einkauf/Verkauf: Bemerkungsfelder gleich groß anzeigen X-Git-Tag: release-3.5.4~29 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=85743ebe243343d54454245d295aa436945b598d;p=kivitendo-erp.git Einkauf/Verkauf: Bemerkungsfelder gleich groß anzeigen --- diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index 234bbc515..dd4f113ce 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -498,12 +498,6 @@ sub form_footer { $form->{invtotal} = $form->{invsubtotal}; $form->{oldinvtotal} = $form->{invtotal}; - # note rows - $form->{rows} = max 2, - $form->numtextrows($form->{notes}, 26, 8), - $form->numtextrows($form->{intnotes}, 35, 8); - - # tax, total and subtotal calculations my ($tax, $subtotal); $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ]; diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 9b8fc2a12..9baad4d3d 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -582,12 +582,6 @@ sub form_footer { $form->{invtotal} = $form->{invsubtotal}; - # note rows - $form->{rows} = max 2, - $form->numtextrows($form->{notes}, 26, 8), - $form->numtextrows($form->{intnotes}, 35, 8); - - # tax, total and subtotal calculations my ($tax, $subtotal); $form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ]; diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index ad0cbf348..c62e694a3 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -680,13 +680,8 @@ sub form_footer { $form->{invtotal} = $form->{invsubtotal}; - my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8); - my $TMPL_VAR = $::request->cache('tmpl_var', {}); - $TMPL_VAR->{notes} = qq||; - $TMPL_VAR->{intnotes} = qq||; - if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) { my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load(); $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked}; diff --git a/templates/webpages/do/form_footer.html b/templates/webpages/do/form_footer.html index 1aae254af..68d8f0737 100644 --- a/templates/webpages/do/form_footer.html +++ b/templates/webpages/do/form_footer.html @@ -21,7 +21,7 @@ [% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %] [% END %] - + [% L.textarea_tag("intnotes", intnotes, wrap="soft", style="width: 350px; height: 150px") %] diff --git a/templates/webpages/ir/form_footer.html b/templates/webpages/ir/form_footer.html index 69fb99300..f9880ad80 100644 --- a/templates/webpages/ir/form_footer.html +++ b/templates/webpages/ir/form_footer.html @@ -18,7 +18,7 @@ [% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %] - + [% L.textarea_tag("intnotes", intnotes, wrap="soft", style="width: 350px; height: 150px") %] diff --git a/templates/webpages/is/form_footer.html b/templates/webpages/is/form_footer.html index c5bb70cf8..7d4c6089d 100644 --- a/templates/webpages/is/form_footer.html +++ b/templates/webpages/is/form_footer.html @@ -18,7 +18,7 @@ [% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
- + [% L.textarea_tag("intnotes", intnotes, wrap="soft", style="width: 350px; height: 150px") %] diff --git a/templates/webpages/oe/form_footer.html b/templates/webpages/oe/form_footer.html index a576fff56..14f29547b 100644 --- a/templates/webpages/oe/form_footer.html +++ b/templates/webpages/oe/form_footer.html @@ -22,8 +22,8 @@ - - + +
[% 'Internal Notes' | $T8 %]
[% notes %][% intnotes %][% L.textarea_tag('notes', notes, style="width: 350px; height: 150px", class="texteditor") %][% L.textarea_tag('intnotes', intnotes, style="width: 350px; height: 150px") %]
[% 'Payment Terms' | $T8 %]