X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=765635f5d4dfd2441ad56d567c4847a76419338a;hb=aacd5750af1d2371dff2abd2db5f6f5f0cca02e6;hp=c6afe176c045efd7ae43d4774bf8cf3a6f20fe8d;hpb=e44cbe168d7cdaedc952a23102d8c834bd3a2993;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index c6afe176c..765635f5d 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -44,8 +44,18 @@ require "$form->{path}/arap.pl"; sub add { $lxdebug->enter_sub(); + + if ($form->{type} eq "credit_note") { + $form->{title} = $locale->text('Add Credit Note'); + + if ($form->{storno}) { + $form->{title} = $locale->text('Add Storno Credit Note'); + } + } else { + $form->{title} = $locale->text('Add Sales Invoice'); + + } - $form->{title} = $locale->text('Add Sales Invoice'); $form->{callback} = "$form->{script}?action=add&type=$form->{type}&login=$form->{login}&path=$form->{path}&password=$form->{password}" @@ -57,9 +67,10 @@ sub add { { $form->error("Access Denied"); } - &invoice_links; &prepare_invoice; + $form->{format} = "pdf"; + &display_form; $lxdebug->leave_sub(); @@ -67,16 +78,26 @@ sub add { sub edit { $lxdebug->enter_sub(); - print STDERR "is.pl-edit\n"; - $form->{title} = $locale->text('Edit Sales Invoice'); + if ($myconfig{acs} =~ "AR--Add Sales Invoice" || $myconfig{acs} =~ "AR--AR") { $form->error("Access Denied"); } - + $edit = 1; + if ($form->{print_and_post}) { + $form->{action} = "print"; + $form->{resubmit} = 1; + $language_id = $form->{language_id}; + $printer_id = $form->{printer_id}; + } &invoice_links; &prepare_invoice; + if ($form->{print_and_post}) { + $form->{language_id} = $language_id; + $form->{printer_id} = $printer_id; + } + &display_form; $lxdebug->leave_sub(); @@ -84,7 +105,7 @@ sub edit { sub invoice_links { $lxdebug->enter_sub(); - print STDERR "is.pl-invoice_links\n"; + $form->{vc} = 'customer'; # create links @@ -98,14 +119,50 @@ sub invoice_links { $form->{customer_id} = $form->{all_customer}->[0]->{id}; } } + + if ($form->{payment_id}) { + $payment_id = $form->{payment_id}; + } + if ($form->{language_id}) { + $language_id = $form->{language_id}; + } + if ($form->{taxzone_id}) { + $taxzone_id = $form->{taxzone_id}; + } + if ($form->{id}) { + $id = $form->{id}; + } + if ($form->{shipto_id}) { + $shipto_id = $form->{shipto_id}; + } + $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}); + } + if ($id) { + $form->{id} = $id; + } IS->retrieve_invoice(\%myconfig, \%$form); $form->{cp_id} = $cp_id; + if ($payment_id) { + $form->{payment_id} = $payment_id; + } + if ($language_id) { + $form->{language_id} = $language_id; + } + if ($taxzone_id) { + $form->{taxzone_id} = $taxzone_id; + } + if ($shipto_id) { + $form->{shipto_id} = $shipto_id; + } + # currencies - @curr = split /:/, $form->{currencies}; + @curr = split(/:/, $form->{currencies}); chomp $curr[0]; $form->{defaultcurrency} = $curr[0]; @@ -184,11 +241,16 @@ sub invoice_links { sub prepare_invoice { $lxdebug->enter_sub(); - print STDERR "is.pl-prepare_invoice\n"; - $form->{type} = "invoice"; - $form->{formname} = "invoice"; - $form->{format} = "html"; - $form->{media} = "screen"; + + 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}) { @@ -200,6 +262,8 @@ sub prepare_invoice { foreach $ref (@{ $form->{invoice_details} }) { $i++; + + map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref}; $form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100); @@ -210,12 +274,12 @@ sub prepare_invoice { $form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces); - + (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/); - $dec_qty = length $dec_qty; - - $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, - $dec_qty); + $dec_qty = length $dec_qty; + + $form->{"qty_$i"} = + $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty); map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit partnotes); @@ -228,27 +292,127 @@ sub prepare_invoice { sub form_header { $lxdebug->enter_sub(); - print STDERR "is.pl-form_header\n"; + + if ($edit) { + + if ($form->{type} eq "credit_note") { + $form->{title} = $locale->text('Edit Credit Note'); + + if ($form->{storno}) { + $form->{title} = $locale->text('Edit Storno Credit Note'); + } + } else { + $form->{title} = $locale->text('Edit Sales Invoice'); + + if ($form->{storno}) { + $form->{title} = $locale->text('Edit Storno Invoice'); + } + } + } + + $payment = qq||; + foreach $item (@{ $form->{payment_terms} }) { + if ($form->{payment_id} eq $item->{id}) { + $payment .= qq||; + } else { + $payment .= qq||; + } + } + + + if (@{ $form->{TAXZONE} }) { + $form->{selecttaxzone} = ""; + foreach $item (@{ $form->{TAXZONE} }) { + if ($item->{id} == $form->{taxzone_id}) { + $form->{selecttaxzone} .= + ""; + } else { + $form->{selecttaxzone} .= + ""; + } + + } + } else { + $form->{selecttaxzone} =~ s/ selected//g; + if ($form->{taxzone_id} ne "") { + $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/; + } + } + if ($form->{rowcount} >0) { + $form->{selecttaxzone} =~ /"; + foreach $item (@{ $form->{SHIPTO} }) { + if ($item->{shipto_id} == $form->{shipto_id}) { + $form->{selectshipto} .= + ""; + } else { + $form->{selectshipto} .= + ""; + } + + } + } else { + $form->{selectshipto} =~ s/ selected//g; + if ($form->{shipto_id} ne "") { + $form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/; + } + } + + $shipto = qq| + | . $locale->text('Shipping Address') . qq| + + |; + + # set option selected - foreach $item (qw(AR customer currency department employee contact)) { + foreach $item (qw(AR customer currency department employee)) { $form->{"select$item"} =~ s/ selected//; $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; } + #quote customer Bug 133 + $form->{selectcustomer} = $form->quote($form->{selectcustomer}); + #build contacts if ($form->{all_contacts}) { - $form->{selectcontact} = ""; + $form->{selectcontact} = ""; foreach $item (@{ $form->{all_contacts} }) { + my $department = ($item->{cp_abteilung}) ? "--$item->{cp_abteilung}" : ""; if ($form->{cp_id} == $item->{cp_id}) { $form->{selectcontact} .= - ""; } else { - $form->{selectcontact} .= ""; } } + } else { + $form->{selectcontact} =~ s/ selected//g; + if ($form->{cp_id} ne "") { + $form->{selectcontact} =~ s/value=$form->{cp_id}/value=$form->{cp_id} selected/; + } + } + + + if (($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}) { + $creditwarning = 1; + } else { + $creditwarning = 0; } #else {$form->{all_contacts} = 0;} @@ -287,7 +451,7 @@ sub form_header { #sk $contact = ($form->{selectcontact}) - ? qq|\n| + ? qq|\n| : qq||; $department = qq| @@ -314,46 +478,112 @@ sub form_header { |; } + if ($form->{max_dunning_level}) { + $dunning = qq| + + + + + + + + + +
| . $locale->text('Max. Dunning Level') . qq|:$form->{max_dunning_level}| . $locale->text('Dunning Amount') . qq|:| + . $form->format_amount(\%myconfig, $form->{dunning_amount},2) + . qq|
+ + +|; + } + $form->{fokus} = "invoice.customer"; # use JavaScript Calendar or not $form->{jsscript} = $jscalendar; $jsscript = ""; - if ($form->{jsscript}) { - - # with JavaScript Calendar - $button1 = qq| - {invdate}> - text('button') . qq|> - |; - $button2 = qq| - {duedate}> - text('button') . qq|> - |; - - #write Trigger - $jsscript = - Form->write_trigger(\%myconfig, "2", "invdate", "BL", "trigger1", - "duedate", "BL", "trigger2"); + if ($form->{type} eq "credit_note") { + if ($form->{jsscript}) { + + # with JavaScript Calendar + $button1 = qq| + {invdate}> + text('button') . qq|> + |; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "1", + "invdate", "BL", + "trigger1"); + } else { + + # without JavaScript Calendar + $button1 = + qq|{invdate}>|; + $button2 = + qq|{duedate}>|; + } } else { - - # without JavaScript Calendar - $button1 = - qq|{invdate}>|; - $button2 = - qq|{duedate}>|; + if ($form->{jsscript}) { + + # with JavaScript Calendar + $button1 = qq| + {invdate}> + text('button') . qq|> + |; + $button2 = qq| + {duedate}> + text('button') . qq|> + |; + $button3 = qq| + {deliverydate}> + text('button') . qq|> + |; + + #write Trigger + $jsscript = + Form->write_trigger(\%myconfig, "3", + "invdate", "BL", + "trigger1", "duedate", + "BL", "trigger2", + "deliverydate", "BL", + "trigger3"); + } else { + + # without JavaScript Calendar + $button1 = + qq|{invdate}>|; + $button2 = + qq|{duedate}>|; + } } - if ($form->{resubmit}) { - $onload = "document.invoice.submit()"; + if ($form->{resubmit} && ($form->{format} eq "html")) { + $onload = + qq|window.open('about:blank','Beleg'); document.invoice.target = 'Beleg';document.invoice.submit()|; + } elsif ($form->{resubmit}) { + $onload = qq|document.invoice.submit()|; } else { $onload = "fokus()"; } + + $credittext = $locale->text('Credit Limit exceeded!!!'); + if ($creditwarning) { + $onload = qq|alert('$credittext')|; + } + $form->header; print qq| + + + +
{script}> @@ -384,6 +614,10 @@ sub form_header { {shipped}> +{storno}> +{storno_id}> + + @@ -419,13 +653,16 @@ sub form_header {
+ $shipto $business + $dunning | . $locale->text('Record in') . qq| - + + $taxzone $department | . $locale->text('Currency') . qq| @@ -443,8 +680,28 @@ sub form_header { | . $locale->text('Ship via') . qq| - - + |; +# +# +# +# +# +# +# +# +# +# +# +#
+# +# +#
+# +# +#
+# +# +print qq| @@ -453,8 +710,18 @@ sub form_header { + |; +if ($form->{type} eq "credit_note") { +print qq| + + + + $button1 + |; +} else { +print qq| @@ -467,6 +734,11 @@ sub form_header { $button2 + + $button3 + |; +} +print qq| @@ -525,7 +797,7 @@ $jsscript sub form_footer { $lxdebug->enter_sub(); - print STDERR "is.pl-form_footer\n"; + $form->{invtotal} = $form->{invsubtotal}; if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) { @@ -629,10 +901,13 @@ sub form_footer { + +
| . $locale->text('Credit Note Number') . qq|
| . $locale->text('Credit Note Date') . qq|
| . $locale->text('Invoice Number') . qq|
| . $locale->text('Delivery Date') . qq|
| . $locale->text('Order Number') . qq|
| . $locale->text('Notes') . qq| | . $locale->text('Internal Notes') . qq|| . $locale->text('Payment Terms') . qq|
$notes $intnotes
@@ -679,6 +954,17 @@ sub form_footer { print $webdav_list; } +if ($form->{type} eq "credit_note") { + print qq| + + + + + + +|; +} else { print qq| |; +} if ($form->{currency} eq $form->{defaultcurrency}) { @column_index = qw(datepaid source memo paid AR_paid); @@ -764,8 +1051,6 @@ sub form_footer { {oldinvtotal}> -{print_and_post}> -{second_run}>
| + . $locale->text('Payments') . qq|
@@ -688,6 +974,7 @@ sub form_footer { . $locale->text('Incoming Payments') . qq|
@@ -796,24 +1081,22 @@ sub form_footer { + . $locale->text('E-mail') . qq|">|; + print qq|| unless ($form->{storno}); + print qq| |; - - if (!$form->{revtrans}) { - if (!$form->{locked}) { - print qq| - - + if ($form->{id} && !($form->{type} eq "credit_note")) { + print qq| + |; - } - } + } + if ($invdate > $closedto) { print qq| - |; @@ -869,6 +1152,9 @@ sub update { if ($form->{second_run}) { $form->{print_and_post} = 0; } + + $form->{update} = 1; + &check_name(customer); &check_project; @@ -909,7 +1195,9 @@ sub update { $form->{creditremaining} += ($form->{oldinvtotal} - $form->{oldtotalpaid}); &check_form; - } else { + } else { + + $form->{"selected_unit_$i"} = $form->{"unit_$i"}; IS->retrieve_item(\%myconfig, \%$form); @@ -928,15 +1216,19 @@ sub update { } else { - $sellprice = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}); + $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); - #print STDERR " SELLPRICE-111- $sellprice\n"; map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit); map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] }; + if ($form->{"part_payment_id_$i"} ne "") { + $form->{payment_id} = $form->{"part_payment_id_$i"}; + } - $form->{"discount_$i"} = $form->{discount} * 100; + if ($form->{"not_discountable_$i"}) { + $form->{"discount_$i"} = 0; + } $s = ($sellprice) ? $sellprice : $form->{"sellprice_$i"}; ($dec) = ($s =~ /\.(\d+)/); @@ -1019,6 +1311,35 @@ sub update { } $lxdebug->leave_sub(); } +sub post_payment { + $lxdebug->enter_sub(); + for $i (1 .. $form->{paidaccounts}) { + if ($form->{"paid_$i"}) { + $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig); + + $form->isblank("datepaid_$i", $locale->text('Payment date missing!')); + + $form->error($locale->text('Cannot post payment for a closed period!')) + if ($datepaid <= $closedto); + + if ($form->{currency} ne $form->{defaultcurrency}) { + $form->{"exchangerate_$i"} = $form->{exchangerate} + if ($invdate == $datepaid); + $form->isblank("exchangerate_$i", + $locale->text('Exchangerate for payment missing!')); + } + } + } + + ($form->{AR}) = split /--/, $form->{AR}; + ($form->{AR_paid}) = split /--/, $form->{AR_paid}; + $form->redirect($locale->text(' Payment posted!')) + if (IS->post_payment(\%myconfig, \%$form)); + $form->error($locale->text('Cannot post payment!')); + + + $lxdebug->leave_sub(); +} sub post { $lxdebug->enter_sub(); @@ -1046,7 +1367,7 @@ sub post { if ($form->{currency} ne $form->{defaultcurrency}); for $i (1 .. $form->{paidaccounts}) { - if ($form->{"paid_$i"}) { + if ($form->parse_amount(\%myconfig, $form->{"paid_$i"})) { $datepaid = $form->datetonum($form->{"datepaid_$i"}, \%myconfig); $form->isblank("datepaid_$i", $locale->text('Payment date missing!')); @@ -1070,8 +1391,14 @@ sub post { $form->{id} = 0 if $form->{postasnew}; - $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber") - unless $form->{invnumber}; + # get new invnumber in sequence if no invnumber is given or if posasnew was requested + if (!$form->{invnumber} || $form->{postasnew}) { + if ($form->{type} eq "credit_note") { + $form->{invnumber} = $form->update_defaults(\%myconfig, "cnnumber"); + } else { + $form->{invnumber} = $form->update_defaults(\%myconfig, "invnumber"); + } + } if ($print_post) { if (!(IS->post_invoice(\%myconfig, \%$form))) { $form->error($locale->text('Cannot post invoice!')); @@ -1094,7 +1421,25 @@ sub print_and_post { $form->{print_and_post} = 1; &post(); - &display_form(); + &edit(); + $lxdebug->leave_sub(); + +} + +sub storno { + $lxdebug->enter_sub(); + + if ($form->{storno}) { + $form->error($locale->text('Cannot storno storno invoice!')); + } + + $form->{storno_id} = $form->{id}; + $form->{storno} = 1; + $form->{id} = ""; + $form->{invnumber} = "Storno zu " . $form->{invnumber}; + $form->{rowcount}--; + + &post(); $lxdebug->leave_sub(); } @@ -1150,6 +1495,60 @@ sub delete { $lxdebug->leave_sub(); } +sub credit_note { + $lxdebug->enter_sub(); + + $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig); + $form->{duedate} = + $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1); + + $form->{id} = ''; + $form->{rowcount}--; + $form->{shipto} = 1; + + + $form->{title} = $locale->text('Add Credit Note'); + $form->{script} = 'is.pl'; + $script = "is"; + $buysell = 'buy'; + + + # bo creates the id, reset it + map { delete $form->{$_} } + qw(id invnumber subject message cc bcc printed emailed queued); + $form->{ $form->{vc} } =~ s/--.*//g; + $form->{type} = "credit_note"; + + + map { $form->{"select$_"} = "" } ($form->{vc}, currency); + + map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } + qw(creditlimit creditremaining); + + $currency = $form->{currency}; + &invoice_links; + + $form->{currency} = $currency; + $form->{exchangerate} = ""; + $form->{forex} = ""; + $form->{exchangerate} = $exchangerate + if ( + $form->{forex} = ( + $exchangerate = + $form->check_exchangerate( + \%myconfig, $form->{currency}, $form->{invdate}, $buysell + ))); + + $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal}); + + &prepare_invoice; + + + &display_form; + + $lxdebug->leave_sub(); +} + sub yes { $lxdebug->enter_sub();