projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Beim Ausdruck die Variablen für den Verkäufer (salesman_*) füllen.
[kivitendo-erp.git]
/
bin
/
mozilla
/
io.pl
diff --git
a/bin/mozilla/io.pl
b/bin/mozilla/io.pl
index
f38ffe2
..
f20d4e5
100644
(file)
--- a/
bin/mozilla/io.pl
+++ b/
bin/mozilla/io.pl
@@
-355,11
+355,10
@@
sub display_row {
}
$column_data{"unit"} = "<td>" .
}
$column_data{"unit"} = "<td>" .
- ($qty_readonly ? " " :
AM->unit_select_html($is_part ? $dimension_units :
$is_assigned ? $service_units : $all_units,
"unit_$i", $this_unit,
AM->unit_select_html($is_part ? $dimension_units :
$is_assigned ? $service_units : $all_units,
"unit_$i", $this_unit,
- $is_assigned ? $form->{"unit_$i"} : undef)
)
+ $is_assigned ? $form->{"unit_$i"} : undef)
. "</td>";
# build in drop down list for pricesgroups
. "</td>";
# build in drop down list for pricesgroups
@@
-1292,7
+1291,7
@@
sub request_for_quotation {
quotation();
}
quotation();
}
-sub e_mail {
+sub e
dit_e
_mail {
$lxdebug->enter_sub();
if ($form->{second_run}) {
$form->{print_and_post} = 0;
$lxdebug->enter_sub();
if ($form->{second_run}) {
$form->{print_and_post} = 0;
@@
-1864,7
+1863,7
@@
sub print_form {
# assign number
$form->{what_done} = $form->{formname};
# assign number
$form->{what_done} = $form->{formname};
- if (!$form->{"${inv}number"} && !$form->{preview}) {
+ if (!$form->{"${inv}number"} && !$form->{preview}
&& !$form->{id}
) {
$form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
if ($form->{media} ne 'email') {
$form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
if ($form->{media} ne 'email') {
@@
-1895,6
+1894,7
@@
sub print_form {
$language_saved = $form->{language_id};
$payment_id_saved = $form->{payment_id};
$language_saved = $form->{language_id};
$payment_id_saved = $form->{payment_id};
+ $salesman_id_saved = $form->{salesman_id};
&{"$form->{vc}_details"}();
&{"$form->{vc}_details"}();
@@
-1924,6
+1924,8
@@
sub print_form {
IS->invoice_details(\%myconfig, \%$form, $locale);
}
IS->invoice_details(\%myconfig, \%$form, $locale);
}
+ $form->get_salesman(\%myconfig, $salesman_id_saved);
+
if ($form->{shipto_id}) {
$form->get_shipto(\%myconfig);
}
if ($form->{shipto_id}) {
$form->get_shipto(\%myconfig);
}