X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fio.pl;h=5588939f8a74805953fa0d3810eb3a3803ec9891;hb=7743b3ab885b485ae317338c55da427b62ab457d;hp=a8a056fa43d4390cf04195b3d4009605502c596f;hpb=340f8780002037e8f75e32be8ea440f83082f619;p=kivitendo-erp.git
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index a8a056fa4..5588939f8 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"};
}
@@ -1177,6 +1180,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);
@@ -1755,8 +1762,7 @@ sub print_form {
if (($form->{type} eq 'invoice') && ($form->{formname} eq 'proforma') ) {
$inv = "inv";
$due = "due";
- $form->{"${inv}date"} = $form->{transdate};
- $form->{"invdate"} = $form->{transdate};
+ $form->{"${inv}date"} = $form->{invdate};
$form->{label} = $locale->text('Proforma Invoice');
$numberfld = "sonumber";
$order = 0;
@@ -1820,7 +1826,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;
@@ -1838,7 +1844,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!')