X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=6987c713661540f6c504791cd5e4cbabe14366f9;hb=5ca651f0b08f68c1f977868204b3629217785157;hp=afcdb66727a12aab7e39643f69d6689838ced7da;hpb=2a4f08f528db948afb887977278667db2784c0ee;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index afcdb6672..6987c7136 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -670,6 +670,7 @@ 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"}; } @@ -1469,6 +1472,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"; @@ -1810,7 +1823,7 @@ sub print_form { $inv = "quo"; $due = "req"; $form->{"${inv}date"} = $form->{transdate}; - $form->{"invdate"} = $form->{transdate}; + $form->{"invdate"} = $form->{transdate}; $form->{label} = $locale->text('Proforma Invoice'); $numberfld = "sqnumber"; $order = 1; @@ -1828,7 +1841,9 @@ sub print_form { $form->isblank("email", $locale->text('E-mail address missing!')) if ($form->{media} eq 'email'); $form->isblank("${inv}date", - $locale->text($form->{label} . ' Date missing!')); + $locale->text($form->{label}) + . ": " + . $locale->text(' Date missing!')); # $locale->text('Invoice Number missing!') # $locale->text('Invoice Date missing!')