X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=450d0b6131f0eb94b75108dfd8b0f7e4fe5cca21;hb=ce498a747292baeaf103118b5073061196d981e4;hp=a732e4d956058f28626082776df7dbbae7ad55ea;hpb=b8916e5c2982dd12e0a612252c85f5e1648e162c;p=kivitendo-erp.git diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index a732e4d95..450d0b613 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -34,6 +34,7 @@ use SL::FU; use SL::IS; use SL::PE; +use SL::OE; use Data::Dumper; use List::Util qw(max sum); @@ -44,10 +45,6 @@ require "bin/mozilla/drafts.pl"; use strict; -my $edit; -my $payment; -my $print_post; - 1; # end of main @@ -147,6 +144,8 @@ sub invoice_links { } } + my $editing = $form->{id}; + $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes id shipto_id)); IS->get_customer(\%myconfig, \%$form); @@ -156,12 +155,21 @@ sub invoice_links { $ref->{name} = $form->quote($ref->{name}); } + # Load data for a specific order and update form fields + my $order_data = OE->get_order_data_by_ordnumber(%$form) if $form->{ordnumber}; + + # Copy the fields we need to %form + for my $key (qw(payment_id salesman_id orddate taxzone_id quonumber)) { + $form->{$key} = $order_data->{$key}; + } + $form->restore_vars(qw(id)); IS->retrieve_invoice(\%myconfig, \%$form); $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id)); $form->restore_vars(qw(taxincluded)) if $form->{id}; - $form->restore_vars(qw(salesman_id)) if $main::editing; + $form->restore_vars(qw(salesman_id)) if $editing; + # build vendor/customer drop down comatibility... don't ask if (@{ $form->{"all_customer"} }) { @@ -169,18 +177,15 @@ sub invoice_links { $form->{customer} = qq|$form->{customer}--$form->{"customer_id"}|; } - $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; - $form->{selectcustomer} = 1; + $form->{"oldcustomer"} = $form->{customer}; + + if ($form->{"oldcustomer"} !~ m/--\d+$/ && $form->{"customer_id"}) { + $form->{"oldcustomer"} .= qq|--$form->{"customer_id"}| + } - # departments -# if ($form->{all_departments}) { -# $form->{selectdepartment} = "\n" -# } @{ $form->{all_departments} }; -# } + +# $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}"; +# $form->{selectcustomer} = 1; $form->{employee} = "$form->{employee}--$form->{employee_id}"; @@ -257,6 +262,8 @@ sub prepare_invoice { (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/); $dec_qty = length $dec_qty; + $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, $decimalplaces); + $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty); $form->{rowcount} = $i; @@ -280,23 +287,13 @@ sub form_header { $main::auth->assert('invoice_edit'); - our %TMPL_VAR = (); + my %TMPL_VAR = (); my @custom_hiddens; $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id}; $form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id}; $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); - $form->{radier} = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0; - - $payment = qq||; - foreach my $item (@{ $form->{payment_terms} }) { - if ($form->{payment_id} eq $item->{id}) { - $payment .= qq||; - } else { - $payment .= qq||; - } - } my $set_duedate_url = "$form->{script}?action=set_duedate"; @@ -315,6 +312,7 @@ sub form_header { "taxzones" => "ALL_TAXZONES", "currencies" => "ALL_CURRENCIES", "customers" => "ALL_CUSTOMERS", + "departments" => "all_departments", "price_factors" => "ALL_PRICE_FACTORS"); $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} }; @@ -335,7 +333,7 @@ sub form_header { my %labels = map { $_ => $_ } @{ $form->{ALL_CURRENCIES} }; $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; $TMPL_VAR{show_exchangerate} = $form->{currency} ne $form->{defaultcurrency}; - $TMPL_VAR{currencies} = NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, + $TMPL_VAR{currencies} = NTI($::cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, '-values' => \@values, '-labels' => \%labels)) if scalar @values; push @custom_hiddens, "forex"; push @custom_hiddens, "exchangerate" if $form->{forex}; @@ -385,373 +383,62 @@ sub form_footer { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - my $cgi = $main::cgi; $main::auth->assert('invoice_edit'); - $form->{invtotal} = $form->{invsubtotal}; + $form->{invtotal} = $form->{invsubtotal}; + $form->{oldinvtotal} = $form->{invtotal}; + + # note rows + $form->{rows} = max 2, + $form->numtextrows($form->{notes}, 26, 8), + $form->numtextrows($form->{intnotes}, 35, 8); - my ($rows, $introws); - if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) { $rows = 2; } - if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) { $introws = 2; } - $form->{rows} = ($rows > $introws) ? $rows : $introws; + # tax, total and subtotal calculations my ($tax, $subtotal); - if (!$form->{taxincluded}) { + $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ]; - foreach my $item (split / /, $form->{taxaccounts}) { - if ($form->{"${item}_base"}) { + foreach my $item (@{ $form->{taxaccounts_array} }) { + if ($form->{"${item}_base"}) { + if ($form->{taxincluded}) { + $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} + / (1 + $form->{"${item}_rate"})), 2); + $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2); + } else { $form->{"${item}_total"} = $form->round_amount( $form->{"${item}_base"} * $form->{"${item}_rate"}, 2); $form->{invtotal} += $form->{"${item}_total"}; - $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); - - $tax .= qq| - - $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% - $form->{"${item}_total"} - |; } } - -# $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); - - $subtotal = qq| - - | . $locale->text('Subtotal') . qq| - $form->{invsubtotal} - -|; - } - if ($form->{taxincluded}) { - $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ]; - foreach my $item (split / /, $form->{taxaccounts}) { - if ($form->{"${item}_base"}) { - $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2); - $form->{"${item}_netto"} = $form->round_amount( ($form->{"${item}_base"} - $form->{"${item}_total"}), 2); - $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); - $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2); - -# $tax .= qq| -# -# Enthaltene $form->{"${item}_description"} | -# . $form->{"${item}_rate"} * 100 .qq|% -# $form->{"${item}_total"} -# -# -# Nettobetrag -# $form->{"${item}_netto"} -# -#|; - } - } - + # follow ups + if ($form->{id}) { + $form->{follow_ups} = FU->follow_ups('trans_id' => $form->{id}) || []; + $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0; } - $form->{oldinvtotal} = $form->{invtotal}; -# $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0); + # payments + my $totalpaid = 0; + $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); + $form->{paid_indices} = [ 1 .. $form->{paidaccounts} ]; - # unfortunately locales doesn't support extended syntax - if ($form->{id}) { - my $follow_ups = FU->follow_ups('trans_id' => $form->{id}); - if (@{ $follow_ups} ) { - $form->{follow_ups_text} = $locale->text("There are #1 unfinished follow-ups of which #2 are due.", - scalar @{ $follow_ups }, - sum map { $_->{due} * 1 } @{ $follow_ups }); - } + for my $i (1 .. $form->{paidaccounts}) { + $form->{"selectAR_paid_$i"} = $form->{selectAR_paid}; + $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/; + $totalpaid += $form->{"paid_$i"}; } - - print $form->parse_html_template('is/form_footer'); - -# print qq| -# -# -# -# -# -# -# -# -#
-# -# -# -# -# -# -# -# -# -# -# -# $follow_ups_block -#
| . $locale->text('Notes') . qq|| . $locale->text('Internal Notes') . qq|| . $locale->text('Payment Terms') . qq|
$notes$intnotes
-# 		-# -# -# -# -# -# -# -# -# -# -# -#
| . $locale->text('Ertrag') . qq|| . $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|
| . $locale->text('Ertrag prozentual') . qq|| . $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %
-# 		-# $taxincluded -# -# $subtotal -# $tax -# -# -# -# -#
| . $locale->text('Total') . qq|$form->{invtotal}
-#
-# -# -#|; -# my $webdav_list; -# if ($main::webdav) { -# $webdav_list = qq| -# -#
-# -# -# Dokumente im Webdav-Repository -# -# -# -# -#|; -# foreach my $file (@{ $form->{WEBDAV} }) { -# $webdav_list .= qq| -# -# -# -# -#|; -# } -# $webdav_list .= qq| -#
DateinameWebdavlink
$file->{name}$file->{type}
-# -#|; -# -# print $webdav_list; -# } -#if ($form->{type} eq "credit_note") { -# print qq| -# -# -# -# -# -# -#|; -#} else { -# print qq| -# -# -# -# -# -# -# -# -# -#
| -# . $locale->text('Payments') . qq|
-# -# -# -# -#|; -#} -# -# my @column_index; -# if ($form->{currency} eq $form->{defaultcurrency}) { -# @column_index = qw(datepaid source memo paid AR_paid); -# } else { -# @column_index = qw(datepaid source memo paid exchangerate AR_paid); -# } -# -# my %column_data; -# $column_data{datepaid} = ""; -# $column_data{paid} = ""; -# $column_data{exchangerate} = ""; -# $column_data{AR_paid} = ""; -# $column_data{source} = ""; -# $column_data{memo} = ""; -# -# print " -# -#"; -# map { print "$column_data{$_}\n" } @column_index; -# print " -# -#"; -# -# my @triggers = (); -# my $totalpaid = 0; -# -# $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); -# for my $i (1 .. $form->{paidaccounts}) { -# -# print " -# \n"; -# -# $form->{"selectAR_paid_$i"} = $form->{selectAR_paid}; -# $form->{"selectAR_paid_$i"} =~ -# s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/; -# -# # format amounts -# $totalpaid += $form->{"paid_$i"}; -# 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"}); -# -# if ($form->{"exchangerate_$i"} == 0) { -# $form->{"exchangerate_$i"} = ""; -# } -# my $exchangerate = qq| |; -# if ($form->{currency} ne $form->{defaultcurrency}) { -# if ($form->{"forex_$i"}) { -# $exchangerate = qq|$form->{"exchangerate_$i"}|; -# } else { -# $exchangerate = qq||; -# } -# } -# -# $exchangerate .= qq||; -# -# $column_data{"paid_$i"} = -# qq||; -# $column_data{"exchangerate_$i"} = qq||; -# $column_data{"AR_paid_$i"} = -# qq||; -# $column_data{"datepaid_$i"} = -# qq||; -# $column_data{"source_$i"} = -# qq||; -# $column_data{"memo_$i"} = -# qq||; -# -# map { print qq|$column_data{"${_}_$i"}\n| } @column_index; -# print " -# \n"; -# push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); -# } -# -# my $paid_missing = $form->{oldinvtotal} - $totalpaid; -# -# print qq| -# -# -# -# -# -# -# -# -# -# -# -# -#|; -# -# map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal)); -# print qq| -#
| -# . $locale->text('Incoming Payments') . qq|
" . $locale->text('Date') . "" . $locale->text('Amount') . "" . $locale->text('Exch') . "" . $locale->text('Account') . "" . $locale->text('Source') . "" . $locale->text('Memo') . "
$exchangerate -#
| . $locale->text('Total') . qq|| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|
| . $locale->text('Missing amount') . qq|| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|
-#
-#|; -# -# print_options(); -# -# print qq| -#
-#|; -# -# my $invdate = $form->datetonum($form->{invdate}, \%myconfig); -# my $closedto = $form->datetonum($form->{closedto}, \%myconfig); -# -# if ($form->{id}) { -# my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq "")); -# -# print qq| -# -# -# -# |; -# print qq| | if ($show_storno); -# print qq| |; -# print qq| |; -# if ($form->{id} && !($form->{type} eq "credit_note")) { -# print qq| |; -# } -# if ($form->{radier}) { -# print qq| |; -# } -# -# -# if ($invdate > $closedto) { -# print qq| |; -# } -# -# print qq| |; -# -# } else { -# if ($invdate > $closedto) { -# print qq| -# -# -# -# -# -# | . -# NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit')); -# } -# } -# -# # button for saving history -# if($form->{id} ne "") { -# print qq| -# |; -# } -# # /button for saving history -# -# # mark_as_paid button -# if($form->{id} ne "") { -# print qq||; -# } -# # /mark_as_paid button -# print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . -# qq| -# -# -#| . -#$cgi->hidden("-name" => "callback", "-value" => $form->{callback}) -#. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) -#. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]) -#. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}]) -#. qq| -# -# -# -# -# -#|; + print $form->parse_html_template('is/form_footer', { + is_type_credit_note => ($form->{type} eq "credit_note"), + totalpaid => $totalpaid, + paid_missing => $form->{invtotal} - $totalpaid, + print_options => print_options(inline => 1), + show_storno => $form->{id} && !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && !$totalpaid, + show_delete => ($form->current_date(\%myconfig) eq $form->{gldate}), + }); +##print $form->parse_html_template('is/_payments'); # parser +##print $form->parse_html_template('webdav/_list'); # parser $main::lxdebug->leave_sub(); } @@ -779,7 +466,7 @@ sub update { my ($recursive_call) = shift; - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call; +# map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(exchangerate creditlimit creditremaining) unless $recursive_call; $form->{print_and_post} = 0 if $form->{second_run}; my $taxincluded = "checked" if $form->{taxincluded}; @@ -824,7 +511,7 @@ sub update { if ($rows > 1) { &select_item; - exit; + ::end_of_request(); } else { @@ -858,7 +545,7 @@ sub update { $form->{creditremaining} -= $amount; - map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice); + map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) } qw(sellprice listprice lastcost); $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}); @@ -911,7 +598,7 @@ sub post_payment { $main::auth->assert('invoice_edit'); - our $invdate; + my $invdate = $form->datetonum($form->{invdate}, \%myconfig); $form->{defaultcurrency} = $form->get_default_currency(\%myconfig); for my $i (1 .. $form->{paidaccounts}) { @@ -964,12 +651,20 @@ sub post { # if oldcustomer ne customer redo form if (&check_name('customer')) { &update; + ::end_of_request(); + } + + if ($myconfig{mandatory_departments} && !$form->{department_id}) { + $form->{saved_message} = $::locale->text('You have to specify a department.'); + update(); exit; } + if ($form->{second_run}) { $form->{print_and_post} = 0; } + remove_emptied_rows(); &validate_items; my $closedto = $form->datetonum($form->{closedto}, \%myconfig); @@ -1023,14 +718,19 @@ sub post { if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = $print_post ? "PRINTED AND POSTED" : - $form->{storno} ? "STORNO" : - "POSTED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = $form->{print_and_post} ? "PRINTED AND POSTED" : + $form->{storno} ? "STORNO" : + "POSTED"; + $form->save_history; } - $form->redirect( $form->{label} . " $form->{invnumber} " . $locale->text('posted!')) - unless $print_post; + if (!$form->{no_redirect_after_post}) { + $form->{action} = 'edit'; + $form->{script} = 'is.pl'; + $form->{saved_message} = $form->{label} . " $form->{invnumber} " . $locale->text('posted!'); + $form->{callback} = build_std_url(qw(action edit id saved_message)); + $form->redirect; + } $main::lxdebug->leave_sub(); } @@ -1042,9 +742,9 @@ sub print_and_post { $main::auth->assert('invoice_edit'); - my $old_form = new Form; - $print_post = 1; - $form->{print_and_post} = 1; + my $old_form = new Form; + $form->{no_redirect_after_post} = 1; + $form->{print_and_post} = 1; &post(); &edit(); @@ -1187,8 +887,6 @@ sub credit_note { $form->{title} = $locale->text('Add Credit Note'); $form->{script} = 'is.pl'; - our $script = "is"; - our $buysell = 'buy'; # bo creates the id, reset it @@ -1200,18 +898,28 @@ sub credit_note { map { $form->{"select$_"} = "" } ($form->{vc}, 'currency'); - map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } - qw(creditlimit creditremaining); +# map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } +# qw(creditlimit creditremaining); my $currency = $form->{currency}; &invoice_links; $form->{currency} = $currency; - $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, $buysell); + $form->{forex} = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, 'buy'); $form->{exchangerate} = $form->{forex} || ''; $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal}); + # bei Gutschriften werden Zahlungseingänge aus Rechnung nicht übernommen + for my $i (1 .. $form->{paidaccounts}) { + delete $form->{"paid_$i"}; + delete $form->{"source_$i"}; + delete $form->{"memo_$i"}; + delete $form->{"datepaid_$i"}; + delete $form->{"AR_paid_$i"}; + }; + $form->{paidaccounts} = 1; + &prepare_invoice; @@ -1231,10 +939,10 @@ sub yes { if (IS->delete_invoice(\%myconfig, \%$form, $main::spool)) { # saving the history - if(!exists $form->{addition}) { + if(!exists $form->{addition}) { $form->{snumbers} = qq|invnumber_| . $form->{invnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history; } # /saving the history $form->redirect($locale->text('Invoice deleted!')); @@ -1252,7 +960,7 @@ sub e_mail { $main::auth->assert('invoice_edit'); if (!$form->{id}) { - $print_post = 1; + $form->{no_redirect_after_post} = 1; my $saved_form = save_form();