projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7022068
)
Einkauf/Verkauf: Bemerkungsfelder gleich groß anzeigen
author
Moritz Bunkus
<m.bunkus@linet-services.de>
Wed, 17 Jul 2019 10:17:16 +0000
(12:17 +0200)
committer
Moritz Bunkus
<m.bunkus@linet-services.de>
Thu, 18 Jul 2019 08:42:45 +0000
(10:42 +0200)
bin/mozilla/ir.pl
patch
|
blob
|
history
bin/mozilla/is.pl
patch
|
blob
|
history
bin/mozilla/oe.pl
patch
|
blob
|
history
templates/webpages/do/form_footer.html
patch
|
blob
|
history
templates/webpages/ir/form_footer.html
patch
|
blob
|
history
templates/webpages/is/form_footer.html
patch
|
blob
|
history
templates/webpages/oe/form_footer.html
patch
|
blob
|
history
diff --git
a/bin/mozilla/ir.pl
b/bin/mozilla/ir.pl
index
234bbc5
..
dd4f113
100644
(file)
--- 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};
$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} ];
# 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
9b8fc2a
..
9baad4d
100644
(file)
--- a/
bin/mozilla/is.pl
+++ b/
bin/mozilla/is.pl
@@
-582,12
+582,6
@@
sub form_footer {
$form->{invtotal} = $form->{invsubtotal};
$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}) ];
# 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
ad0cbf3
..
c62e694
100644
(file)
--- a/
bin/mozilla/oe.pl
+++ b/
bin/mozilla/oe.pl
@@
-680,13
+680,8
@@
sub form_footer {
$form->{invtotal} = $form->{invsubtotal};
$form->{invtotal} = $form->{invsubtotal};
- my $introws = max 5, $form->numtextrows($form->{intnotes}, 35, 8);
-
my $TMPL_VAR = $::request->cache('tmpl_var', {});
my $TMPL_VAR = $::request->cache('tmpl_var', {});
- $TMPL_VAR->{notes} = qq|<textarea name="notes" class="texteditor" wrap="soft" style="width: 350px; height: 150px">| . H($form->{notes}) . qq|</textarea>|;
- $TMPL_VAR->{intnotes} = qq|<textarea name=intnotes rows="$introws" cols="35">| . H($form->{intnotes}) . qq|</textarea>|;
-
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};
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
1aae254
..
68d8f07
100644
(file)
--- 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 %]
</td>
[% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
[% END %]
</td>
- <td>
<textarea name="intnotes" rows="[% LxERP.numtextrows(intnotes, 35, 8, 2) %]" cols="35" wrap="soft"[% RO %]>[% HTML.escape(intnotes) %]</textarea>
</td>
+ <td>
[% L.textarea_tag("intnotes", intnotes, wrap="soft", style="width: 350px; height: 150px") %]
</td>
</tr>
<tr>
</tr>
<tr>
diff --git
a/templates/webpages/ir/form_footer.html
b/templates/webpages/ir/form_footer.html
index
69fb993
..
f9880ad
100644
(file)
--- 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") %]
</td>
<td>
[% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
</td>
<td>
- <textarea name="intnotes" rows="[% rows %]" cols="35" wrap="soft">[% intnotes %]</textarea>
+ [% L.textarea_tag("intnotes", intnotes, wrap="soft", style="width: 350px; height: 150px") %]
</td>
<td>
<table>
</td>
<td>
<table>
diff --git
a/templates/webpages/is/form_footer.html
b/templates/webpages/is/form_footer.html
index
c5bb70c
..
7d4c608
100644
(file)
--- 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") %]
</td>
<td>
[% L.textarea_tag("notes", notes, wrap="soft", style="width: 350px; height: 150px", class="texteditor") %]
</td>
<td>
- <textarea name="intnotes" rows="[% rows %]" cols="35">[% intnotes %]</textarea>
+ [% L.textarea_tag("intnotes", intnotes, wrap="soft", style="width: 350px; height: 150px") %]
</td>
<td>
<table>
</td>
<td>
<table>
diff --git
a/templates/webpages/oe/form_footer.html
b/templates/webpages/oe/form_footer.html
index
a576fff
..
14f2954
100644
(file)
--- a/
templates/webpages/oe/form_footer.html
+++ b/
templates/webpages/oe/form_footer.html
@@
-22,8
+22,8
@@
<th align="left">[% 'Internal Notes' | $T8 %]</th>
</tr>
<tr valign="top">
<th align="left">[% 'Internal Notes' | $T8 %]</th>
</tr>
<tr valign="top">
- <td>[%
notes
%]</td>
- <td>[%
intnotes
%]</td>
+ <td>[%
L.textarea_tag('notes', notes, style="width: 350px; height: 150px", class="texteditor")
%]</td>
+ <td>[%
L.textarea_tag('intnotes', intnotes, style="width: 350px; height: 150px")
%]</td>
</tr>
<tr>
<th align="right">[% 'Payment Terms' | $T8 %]</th>
</tr>
<tr>
<th align="right">[% 'Payment Terms' | $T8 %]</th>