X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=4637f6ba3011b3b9dcf18d115abc63850fd344c2;hb=5b47ed3efe5f4ef0810096b0f4849047cee54690;hp=badf0655b9c4a24c869be0a935b5f0be3d77991d;hpb=85e36de2a319d0dbaa2e1572c16c9537d0d5f3ce;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index badf0655b..4637f6ba3 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -69,8 +69,6 @@ sub add { } &invoice_links; &prepare_invoice; - $form->{format} = "pdf"; - &display_form; $lxdebug->leave_sub(); @@ -246,11 +244,9 @@ sub prepare_invoice { if ($form->{type} eq "credit_note") { $form->{type} = "credit_note"; $form->{formname} = "credit_note"; - $form->{media} = "screen"; } else { $form->{type} = "invoice"; $form->{formname} = "invoice"; - $form->{media} = "screen"; } if ($form->{id}) { @@ -335,10 +331,11 @@ sub form_header { foreach $item (@{ $form->{TAXZONE} }) { if ($item->{id} == $form->{taxzone_id}) { $form->{selecttaxzone} .= - "{id} selected>$item->{description}"; + "{id} selected>" . H($item->{description}) . + ""; } else { $form->{selecttaxzone} .= - "{id}>$item->{description}"; + "{id}>" . H($item->{description}) . ""; } } @@ -348,11 +345,6 @@ sub form_header { $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/; } } - if ($form->{rowcount} >0) { - $form->{selecttaxzone} =~ /.*?<\/option>/; - $form->{selecttaxzone} = $&; - } - $taxzone = qq| @@ -375,6 +367,7 @@ sub form_header { } } else { + $form->{selectshipto} = $form->unquote($form->{selectshipto}); $form->{selectshipto} =~ s/ selected//g; if ($form->{shipto_id} ne "") { $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/; @@ -383,8 +376,9 @@ sub form_header { $shipto = qq| | . $locale->text('Shipping Address') . qq| - $form->{selectshipto} - |; + $form->{selectshipto}|; + $form->{selectshipto} = $form->quote($form->{selectshipto}); + $shipto .= qq| |; @@ -586,6 +580,13 @@ sub form_header { $onload = qq|alert('$credittext')|; } + $form->{"javascript"} .= qq||; + + $jsscript .= + $form->write_trigger(\%myconfig, 2, + "orddate", "BL", "trigger_orddate", + "quodate", "BL", "trigger_quodate"); + $form->header; print qq| @@ -752,10 +753,20 @@ print qq| | . $locale->text('Order Number') . qq| + + | . $locale->text('Order Date') . qq| + + + | . $locale->text('Quotation Number') . qq| + + | . $locale->text('Quotation Date') . qq| + + + | . $locale->text('Customer Order Number') . qq| @@ -916,7 +927,7 @@ sub form_footer { $notes $intnotes - $payment + $payment @@ -1007,6 +1018,8 @@ if ($form->{type} eq "credit_note") { "; + my @triggers = (); + $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); for $i (1 .. $form->{paidaccounts}) { @@ -1047,7 +1060,8 @@ if ($form->{type} eq "credit_note") { $column_data{"AR_paid_$i"} = qq|$form->{"selectAR_paid_$i"}|; $column_data{"datepaid_$i"} = - qq|{"datepaid_$i"}>|; + qq|{"datepaid_$i"}> + |; $column_data{"source_$i"} = qq||; $column_data{"memo_$i"} = @@ -1056,6 +1070,7 @@ if ($form->{type} eq "credit_note") { map { print qq|$column_data{"${_}_$i"}\n| } @column_index; print " \n"; + push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); } print qq| @@ -1086,7 +1101,7 @@ if ($form->{type} eq "credit_note") { if ($form->{id}) { print qq| - @@ -1098,6 +1113,9 @@ if ($form->{type} eq "credit_note") { . $locale->text('Storno') . qq|">| unless ($form->{storno}); print qq| +|; + print qq| |; if ($form->{id} && !($form->{type} eq "credit_note")) { print qq| @@ -1122,7 +1140,7 @@ if ($form->{type} eq "credit_note") { } else { if ($invdate > $closedto) { - print qq|text('Update') . qq|"> @@ -1137,12 +1155,8 @@ if ($form->{type} eq "credit_note") { } } - if ($form->{menubar}) { - require "$form->{path}/menu.pl"; - &menubar; - } - - print qq| + print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . + qq| {rowcount}> @@ -1444,6 +1458,18 @@ sub print_and_post { } +sub use_as_template { + $lxdebug->enter_sub(); + + map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno); + $form->{paidaccounts} = 1; + $form->{rowcount}--; + $form->{invdate} = $form->current_date(\%myconfig); + &display_form; + + $lxdebug->leave_sub(); +} + sub storno { $lxdebug->enter_sub(); @@ -1455,7 +1481,6 @@ sub storno { $form->{storno} = 1; $form->{id} = ""; $form->{invnumber} = "Storno zu " . $form->{invnumber}; - $form->{rowcount}--; &post(); $lxdebug->leave_sub();