X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=8b0b7fc6930443e873675c843df0066d7d39c2da;hb=c046c42244acda83029d00cb06ff636063765fb2;hp=4a094d2c1ad935ee64dcfafc0dbb0df05f90c4a8;hpb=a25ac4907df1aca0db5fd0017b96e5d0bc5eadf1;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 4a094d2c1..8b0b7fc69 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -488,7 +488,7 @@ sub display_row {
print qq|
$projectnumber
-
+
|;
if ($form->{type} eq 'invoice' or $form->{type} =~ /order/) {
@@ -667,9 +667,10 @@ sub select_item {
-
+
+
{id}>
@@ -732,7 +733,9 @@ sub item_selected {
$sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"});
map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} }
- qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts partsgroup formel longdescription not_discountable);
+ qw(id partnumber description sellprice listprice inventory_accno
+ income_accno expense_accno bin unit weight assembly taxaccounts
+ partsgroup formel longdescription not_discountable partnotes);
if ($form->{"part_payment_id_$i"} ne "") {
$form->{payment_id} = $form->{"part_payment_id_$i"};
}
@@ -886,6 +889,8 @@ sub display_form {
exit;
}
+ Common::webdav_folder($form) if ($webdav);
+
# if ( $form->{print_and_post}
# && $form->{second_run}
# && ($form->{action} eq "display_form")) {
@@ -1177,6 +1182,10 @@ sub order {
$form->{cp_id} *= 1;
require "$form->{path}/$form->{script}";
+ my $script = $form->{"script"};
+ $script =~ s|.*/||;
+ $script =~ s|.pl$||;
+ $locale = new Locale($language, $script);
map { $form->{"select$_"} = "" } ($form->{vc}, currency);
@@ -1322,7 +1331,7 @@ sub e_mail {
my $attachment_filename = $formname_translations{$form->{"formname"}};
my $prefix;
- if ($form->{"type"} =~ /invoice/) {
+ if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) {
$prefix = "inv";
} elsif ($form->{"type"} =~ /_quotation$/) {
$prefix = "quo";
@@ -1469,6 +1478,16 @@ sub print_options {
$myconfig{"copies"} ? $myconfig{"copies"} :
3;
+ $form->{"media"} =
+ $form->{"media"} ? $form->{"media"} :
+ $myconfig{"default_media"} ? $myconfig{"default_media"} :
+ "screen";
+
+ $form->{"printer_id"} =
+ defined($form->{"printer_id"}) ? $form->{"printer_id"} :
+ $myconfig{"default_printer_id"} ? $myconfig{"default_printer_id"} :
+ "";
+
$form->{PD}{ $form->{formname} } = "selected";
$form->{DF}{ $form->{format} } = "selected";
$form->{OP}{ $form->{media} } = "selected";
@@ -1530,20 +1549,6 @@ sub print_options {
. $locale->text('Credit Note');
}
- if ($form->{type} eq 'ship_order') {
- $type = qq|