X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=0334843f9ddd7cbcbf26b0642b4705dff1bc88c9;hb=864b73ffb0964215f287a393ea37ec2eef6eb8eb;hp=49e1b7f832acd20872af38d04a8aa96c818a5ca6;hpb=04db23598c90725ff1eb23fb68cff7829392cc55;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 49e1b7f83..0334843f9 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(); @@ -138,6 +136,7 @@ sub invoice_links { $cp_id = $form->{cp_id}; IS->get_customer(\%myconfig, \%$form); + #quote all_customer Bug 133 foreach $ref (@{ $form->{all_customer} }) { $ref->{name} = $form->quote($ref->{name}); @@ -170,7 +169,7 @@ sub invoice_links { $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; - if ($form->{all_customer}) { + if (@{ $form->{all_customer} }) { $form->{customer} = "$form->{customer}--$form->{customer_id}"; map { $form->{selectcustomer} .= "$_->{name}--$_->{id}\n" } (@{ $form->{all_customer} }); @@ -245,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}) { @@ -260,10 +257,11 @@ sub prepare_invoice { # # get pricegroups for parts # IS->get_pricegroups_for_parts(\%myconfig, \%$form); + my $i = 0; + foreach $ref (@{ $form->{invoice_details} }) { $i++; - map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref}; $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100); @@ -310,6 +308,9 @@ sub form_header { } } + $form->{radier} = + ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; + $payment = qq||; foreach $item (@{ $form->{payment_terms} }) { if ($form->{payment_id} eq $item->{id}) { @@ -319,16 +320,22 @@ sub form_header { } } + my $set_duedate_url = + "$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=set_duedate"; + + my $pjx = new CGI::Ajax( 'set_duedate' => $set_duedate_url ); + push(@ { $form->{AJAX} }, $pjx); if (@{ $form->{TAXZONE} }) { $form->{selecttaxzone} = ""; 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}) . ""; } } @@ -338,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| @@ -355,16 +357,17 @@ sub form_header { if (@{ $form->{SHIPTO} }) { $form->{selectshipto} = ""; foreach $item (@{ $form->{SHIPTO} }) { - if ($item->{id} == $form->{shipto_id}) { + if ($item->{shipto_id} == $form->{shipto_id}) { $form->{selectshipto} .= - "{id} selected>$item->{shiptoname}"; + "{shipto_id} selected>$item->{shiptoname} $item->{shiptodepartment_1}"; } else { $form->{selectshipto} .= - "{id}>$item->{shiptoname}"; + "{shipto_id}>$item->{shiptoname} $item->{shiptodepartment}"; } } } 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/; @@ -373,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| |; @@ -576,6 +580,8 @@ sub form_header { $onload = qq|alert('$credittext')|; } + $form->{"javascript"} .= qq||; + $form->header; print qq| @@ -659,7 +665,7 @@ sub form_header { $dunning | . $locale->text('Record in') . qq| - $form->{selectAR} + $form->{selectAR} $taxzone @@ -906,7 +912,7 @@ sub form_footer { $notes $intnotes - $payment + $payment @@ -997,6 +1003,8 @@ if ($form->{type} eq "credit_note") { "; + my @triggers = (); + $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); for $i (1 .. $form->{paidaccounts}) { @@ -1009,8 +1017,10 @@ if ($form->{type} eq "credit_note") { # format amounts $totalpaid += $form->{"paid_$i"}; - $form->{"paid_$i"} = - $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); + if ($form->{"paid_$i"}) { + $form->{"paid_$i"} = + $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); + } $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"}); @@ -1035,7 +1045,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"} = @@ -1044,6 +1055,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| @@ -1074,7 +1086,7 @@ if ($form->{type} eq "credit_note") { if ($form->{id}) { print qq| - @@ -1086,6 +1098,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| @@ -1093,6 +1108,12 @@ if ($form->{type} eq "credit_note") { . $locale->text('Credit Note') . qq|"> |; } + if ($form->{radier}) { + print qq| + +|; + } if ($invdate > $closedto) { @@ -1104,7 +1125,7 @@ if ($form->{type} eq "credit_note") { } else { if ($invdate > $closedto) { - print qq|text('Update') . qq|"> @@ -1119,12 +1140,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}> @@ -1197,8 +1214,6 @@ sub update { } else { - $form->{"selected_unit_$i"} = $form->{"unit_$i"}; - IS->retrieve_item(\%myconfig, \%$form); $rows = scalar @{ $form->{item_list} }; @@ -1333,6 +1348,7 @@ sub post_payment { ($form->{AR}) = split /--/, $form->{AR}; ($form->{AR_paid}) = split /--/, $form->{AR_paid}; + relink_accounts(); $form->redirect($locale->text(' Payment posted!')) if (IS->post_payment(\%myconfig, \%$form)); $form->error($locale->text('Cannot post payment!')); @@ -1399,6 +1415,7 @@ sub post { $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber"); } } + relink_accounts(); if ($print_post) { if (!(IS->post_invoice(\%myconfig, \%$form))) { $form->error($locale->text('Cannot post invoice!')); @@ -1426,6 +1443,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(); @@ -1437,7 +1466,6 @@ sub storno { $form->{storno} = 1; $form->{id} = ""; $form->{invnumber} = "Storno zu " . $form->{invnumber}; - $form->{rowcount}--; &post(); $lxdebug->leave_sub();