X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fir.pl;h=042fd4be945df47ccccd764c7fbd124e78ab4eb7;hb=19db5b9099df8a70daac82388e45c0aee17c9266;hp=d848abc64f2a9c54cb57fe5215a91f7c91a63a7c;hpb=56e9d81259d7f0b45b8a9dd3dc8dce6e048806c3;p=kivitendo-erp.git diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index d848abc64..042fd4be9 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -97,6 +97,8 @@ sub invoice_links { $main::auth->assert('vendor_invoice_edit'); + $form->{vc} = 'vendor'; + # create links $form->{webdav} = $main::webdav; $form->{jsscript} = 1; @@ -145,6 +147,12 @@ sub invoice_links { $form->{oldvendor} = "$form->{vendor}--$form->{vendor_id}"; + # build vendor/customer drop down comatibility... don't ask + if (@{ $form->{"all_vendor"} || [] }) { + $form->{"selectvendor"} = 1; + $form->{vendor} = qq|$form->{vendor}--$form->{vendor_id}|; + } + # departments if ($form->{all_departments}) { $form->{selectdepartment} = "\n"; @@ -153,7 +161,7 @@ sub invoice_links { map { $form->{selectdepartment} .= "$_->{description}--$_->{id}\n" - } (@{ $form->{all_departments} }); + } (@{ $form->{all_departments} || [] }); } # forex @@ -248,299 +256,93 @@ sub form_header { my $locale = $main::locale; my $cgi = $main::cgi; - $main::auth->assert('vendor_invoice_edit'); + $main::auth->assert('invoice_edit'); - push @{ $form->{AJAX} }, CGI::Ajax->new('set_duedate_vendor' => "$form->{script}?action=set_duedate_vendor"); + our %TMPL_VAR = (); + my @custom_hiddens; - # set option selected - foreach my $item (qw(AP vendor currency department)) { - $form->{"select$item"} =~ s/ selected//; - $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; - } + $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->{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; - $form->{exchangerate} = $form->format_amount(\%myconfig, $form->{exchangerate}); - $form->{creditlimit} = $form->format_amount(\%myconfig, $form->{creditlimit}, 0, "0"); - $form->{creditremaining} = $form->format_amount(\%myconfig, $form->{creditremaining}, 0, "0"); - - my $exchangerate = ""; - if ($form->{currency} ne $form->{defaultcurrency}) { - if ($form->{forex}) { - $exchangerate .= qq| | . $locale->text('Exchangerate') . qq| - $form->{exchangerate}{exchangerate}>\n|; - } else { - $exchangerate .= qq| | . $locale->text('Exchangerate') . qq| - {exchangerate}>\n|; - } - } - $exchangerate .= qq| {forex}>\n|; + + my $set_duedate_url = "$form->{script}?action=set_duedate"; + + push @ { $form->{AJAX} }, new CGI::Ajax( 'set_duedate' => $set_duedate_url ); my @old_project_ids = ($form->{"globalproject_id"}); map { push @old_project_ids, $form->{"project_id_$_"} if $form->{"project_id_$_"}; } 1..$form->{"rowcount"}; $form->get_lists("contacts" => "ALL_CONTACTS", - "projects" => { "key" => "ALL_PROJECTS", - "all" => 0, - "old_id" => \@old_project_ids }, + "shipto" => "ALL_SHIPTO", + "projects" => { "key" => "ALL_PROJECTS", + "all" => 0, + "old_id" => \@old_project_ids }, + "employees" => "ALL_EMPLOYEES", "taxzones" => "ALL_TAXZONES", - "employees" => "ALL_SALESMEN", "currencies" => "ALL_CURRENCIES", "vendors" => "ALL_VENDORS", + "departments" => "all_departments", "price_factors" => "ALL_PRICE_FACTORS"); - my %labels; - my @values = (undef); - foreach my $item (@{ $form->{"ALL_CONTACTS"} }) { - push(@values, $item->{"cp_id"}); - $labels{$item->{"cp_id"}} = $item->{"cp_name"} . ($item->{"cp_abteilung"} ? " ($item->{cp_abteilung})" : ""); - } - - my $contact; - if (scalar @values > 1) { - $contact = qq| - - | . $locale->text('Contact Person') . qq| - | . NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-style' => 'width: 250px', - '-labels' => \%labels, '-default' => $form->{"cp_id"})) . qq| - - |; - } - - %labels = (); - @values = (""); - foreach my $item (@{ $form->{"ALL_PROJECTS"} }) { - push(@values, $item->{"id"}); - $labels{$item->{"id"}} = $item->{"projectnumber"}; - } - my $globalprojectnumber = NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values, '-labels' => \%labels, - '-default' => $form->{"globalproject_id"})); - - %labels = (); - @values = (); - my $i = 0; - foreach my $item (@{ $form->{"ALL_CURRENCIES"} }) { - push(@values, $item); - $labels{$item} = $item; - } - - $form->{currency} = $form->{defaultcurrency} unless $form->{currency}; - my $currencies; - if (scalar @values) { - $currencies = qq| - - | . $locale->text('Currency') . qq| - | . NTI($cgi->popup_menu('-name' => 'currency', '-default' => $form->{"currency"}, - '-values' => \@values, '-labels' => \%labels)) . qq| - - |; - } - - %labels = (); - @values = (); - foreach my $item (@{ $form->{"ALL_SALESMEN"} }) { - push(@values, $item->{"id"}); - $labels{$item->{"id"}} = $item->{"name"}; - } - my $employees = qq| - - | . $locale->text('Employee') . qq| - | . NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"}, - '-values' => \@values, '-labels' => \%labels)) . qq| - - |; - - %labels = (); - @values = (); - foreach my $item (@{ $form->{"ALL_VENDORS"} }) { - push(@values, $item->{name}.qq|--|.$item->{"id"}); - $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"}; - } - - $form->{selectvendor} = ($myconfig{vclimit} > scalar(@values)); - - my $vendors = qq| - | . $locale->text('Vendor') . qq| - | . - (($myconfig{vclimit} <= scalar(@values)) - ? qq|| - : (NTI($cgi->popup_menu('-name' => 'vendor', '-default' => $form->{oldvendor}, - '-onChange' => 'document.getElementById(\'update_button\').click();', - '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq| - - |; - - %labels = (); - @values = (); - foreach my $item (@{ $form->{"ALL_TAXZONES"} }) { - push(@values, $item->{"id"}); - $labels{$item->{"id"}} = $item->{"description"}; - } - - my $taxzone; - if (!$form->{"id"}) { - $taxzone = qq| - - | . $locale->text('Steuersatz') . qq| - | . NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"}, - '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')) . qq| - - |; - } else { - $taxzone = qq| - - | . $locale->text('Steuersatz') . qq| - - - | . H($labels{$form->{"taxzone_id"}}) . qq| - - |; - } - - my $department = qq| - - | . $locale->text('Department') . qq| - $form->{selectdepartment} - - - \n| if $form->{selectdepartment}; - - my $n = ($form->{creditremaining} =~ /-/) ? "0" : "1"; - - # use JavaScript Calendar or not - $form->{jsscript} = 1; - my $jsscript = ""; - - my $button1 = qq| - - - - \n|; - -#, 'old_duedate__'' + document.getElementsByName('duedate')[0].value, 'vendor_id__' + document.getElementsByName('vendor_id')[0].value],['duedate'])"> - my $button2 = qq| - - - text('button') . qq|> - \n|; - - #write Trigger - $jsscript = - Form->write_trigger(\%myconfig, "2", - "invdate", "BL", "trigger1", - "duedate", "BL", "trigger2"); + $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} }; +# $TMPL_VAR{shipto_labels} = sub { join "; ", grep { $_ } map { $_[0]->{"shipto${_}" } } qw(name department_1 street city) }; + $TMPL_VAR{contact_labels} = sub { join(', ', $_[0]->{"cp_name"}, $_[0]->{"cp_givenname"}) . ($_[0]->{cp_abteilung} ? " ($_[0]->{cp_abteilung})" : "") }; + $TMPL_VAR{department_labels} = sub { "$_[0]->{description}--$_[0]->{id}" }; + + # customer + $TMPL_VAR{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; + $TMPL_VAR{vclimit} = $myconfig{vclimit}; + $TMPL_VAR{vc_select} = "customer_or_vendor_selection_window('vendor', '', 1, 0)"; + push @custom_hiddens, "vendor_id"; + push @custom_hiddens, "oldvendor"; + push @custom_hiddens, "selectvendor"; + + # currencies and exchangerate + my @values = map { $_ } @{ $form->{ALL_CURRENCIES} }; + 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"}, + '-values' => \@values, '-labels' => \%labels)) if scalar @values; + push @custom_hiddens, "forex"; + push @custom_hiddens, "exchangerate" if $form->{forex}; + + $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update}; + $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/; + + $form->{fokus} = "invoice.vendor"; my $follow_up_vc = $form->{vendor}; $follow_up_vc =~ s/--\d*\s*$//; - my $follow_up_trans_info = "$form->{invnumber} ($follow_up_vc)"; - - $form->{javascript} .= qq||; - $form->{javascript} .= qq||; - $form->{javascript} .= qq||; - $form->{javascript} .= qq||; - - $jsscript .= $form->write_trigger(\%myconfig, 2, "orddate", "BL", "trigger_orddate", "quodate", "BL", "trigger_quodate"); + $TMPL_VAR{vendor_name} = $follow_up_vc; - $form->header; - my $onload = qq|focus()|; - $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|; - $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|; - print qq| - - - -|; - - $form->hide_form(qw(id title vc type level creditlimit creditremaining closedto locked shippted storno storno_id - max_dunning_level dunning_amount vendor_id oldvendor selectvendor taxaccounts - fxgain_accno fxloss_accno taxpart taxservice cursor_fokus - convert_from_oe_ids convert_from_do_ids), - map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} ); +# set option selected + foreach my $item (qw(AP)) { + $form->{"select$item"} =~ s/ selected//; + $form->{"select$item"} =~ s/option>\Q$form->{$item}\E/option selected>$form->{$item}/; + } - print qq|$form->{saved_message}| if $form->{saved_message}; + $TMPL_VAR{is_type_credit_note} = $form->{type} eq "credit_note"; + $TMPL_VAR{is_format_html} = $form->{format} eq 'html'; + $TMPL_VAR{dateformat} = $myconfig{dateformat}; + $TMPL_VAR{numberformat} = $myconfig{numberformat}; - print qq| + # hiddens + $TMPL_VAR{HIDDENS} = [qw( + id action type media format queued printed emailed title vc discount + title creditlimit creditremaining tradediscount business closedto locked shipped storno storno_id + max_dunning_level dunning_amount + shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax + shiptoemail shiptodepartment_1 shiptodepartment_2 message email subject cc bcc taxaccounts cursor_fokus + convert_from_do_ids convert_from_oe_ids + ), @custom_hiddens, + map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; -$form->{title} - - - - - - $vendors - $contact - - | . $locale->text('Credit Limit') . qq| - $form->{creditlimit}; | . $locale->text('Remaining') . qq| $form->{creditremaining} - - - | . $locale->text('Record in') . qq| - $form->{selectAP} - - - $taxzone - $department - - $currencies - $exchangerate - - - - - - $employees - - | . $locale->text('Invoice Number') . qq| - - - - | . $locale->text('Invoice Date') . qq| - $button1 - - - | . $locale->text('Due Date') . qq| - $button2 - - - | . $locale->text('Order Number') . qq| - - - - - | . $locale->text('Order Date') . qq| - - - - - | . $locale->text('Quotation Date') . qq| - - - - - | . $locale->text('Project Number') . qq| - $globalprojectnumber - - - - - - - - -$jsscript - - -|; + $form->{jsscript} = 1; + $form->header(); - foreach my $item (split / /, $form->{taxaccounts}) { - print qq| -{"${item}_rate"}> - -|; - } + print $form->parse_html_template("ir/form_header", \%TMPL_VAR); $main::lxdebug->leave_sub(); } @@ -551,368 +353,61 @@ sub form_footer { my $form = $main::form; my %myconfig = %main::myconfig; my $locale = $main::locale; - my $cgi = $main::cgi; - - $main::auth->assert('vendor_invoice_edit'); - - $form->{invtotal} = $form->{invsubtotal}; - - my ($rows, $introws); - if (($rows = $form->numtextrows($form->{notes}, 25, 8)) < 2) { - $rows = 2; - } - if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) { - $introws = 2; - } - $rows = ($rows > $introws) ? $rows : $introws; - my $notes = - qq|$form->{notes}|; - my $intnotes = - qq|$form->{intnotes}|; - - $form->{taxincluded} = ($form->{taxincluded}) ? "checked" : ""; - - my $taxincluded = ""; - if ($form->{taxaccounts}) { - $taxincluded = qq| - {taxincluded}> | - . $locale->text('Tax Included') . qq| -|; - } - my ($tax, $subtotal); - if (!$form->{taxincluded}) { - - foreach my $item (split / /, $form->{taxaccounts}) { - if ($form->{"${item}_base"}) { - $form->{invtotal} += $form->{"${item}_total"} = - $form->round_amount( - $form->{"${item}_base"} * $form->{"${item}_rate"}, - 2); - $form->{"${item}_total"} = - $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); - - $tax .= qq| - - $form->{"${item}_description"} | - . $form->{"${item}_rate"} * 100 .qq|% - $form->{"${item}_total"} - -|; - } - } + $main::auth->assert('invoice_edit'); - $form->{invsubtotal} = - $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); + $form->{invtotal} = $form->{invsubtotal}; + $form->{oldinvtotal} = $form->{invtotal}; - $subtotal = qq| - - | . $locale->text('Subtotal') . qq| - $form->{invsubtotal} - -|; + # note rows + $form->{rows} = max 2, + $form->numtextrows($form->{notes}, 26, 8), + $form->numtextrows($form->{intnotes}, 35, 8); - } - if ($form->{taxincluded}) { - 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}_base"} = - $form->round_amount($form->{"${item}_base"}, 2); - $form->{"${item}_netto"} = - $form->round_amount( - ($form->{"${item}_base"} - $form->{"${item}_total"}), - 2); - $form->{"${item}_netto"} = - $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2); - $form->{"${item}_total"} = - $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); - - $tax .= qq| - - Enthaltene $form->{"${item}_description"} | - . $form->{"${item}_rate"} * 100 .qq|% - $form->{"${item}_total"} - - - Nettobetrag - $form->{"${item}_netto"} - -|; + # tax, total and subtotal calculations + my ($tax, $subtotal); + $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ]; + + 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->{oldinvtotal} = $form->{invtotal}; - $form->{invtotal} = - $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0); - - my $follow_ups_block; + # follow ups if ($form->{id}) { - my $follow_ups = FU->follow_ups('trans_id' => $form->{id}); - - if (@{ $follow_ups} ) { - my $num_due = sum map { $_->{due} * 1 } @{ $follow_ups }; - $follow_ups_block = qq| - - | . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq| - -|; - } + $form->{follow_ups} = FU->follow_ups('trans_id' => $form->{id}) || []; + $form->{follow_ups_unfinished} = ( sum map { $_->{due} * 1 } @{ $form->{follow_ups} } ) || 0; } - our $colspan; - print qq| - - - - - - - - | . $locale->text('Notes') . qq| - | . $locale->text('Internal Notes') . qq| - - - $notes - $intnotes - - $follow_ups_block - - - - $taxincluded - - - $subtotal - $tax - - | . $locale->text('Total') . qq| - $form->{invtotal} - - - - - - - -|; - my $webdav_list; - if ($main::webdav) { - $webdav_list = qq| - - - - - Dokumente im Webdav-Repository - - - Dateiname - Webdavlink -|; - foreach my $file (@{ $form->{WEBDAV} }) { - $webdav_list .= qq| - - $file->{name} - $file->{type} - -|; - } - $webdav_list .= qq| - - -|; - - print $webdav_list; - } - print qq| - - - - - | . $locale->text('Payments') . qq| - -|; - - my @column_index; - if ($form->{currency} eq $form->{defaultcurrency}) { - @column_index = qw(datepaid source memo paid AP_paid); - } else { - @column_index = qw(datepaid source memo paid exchangerate AP_paid); - } - - my %column_data; - $column_data{datepaid} = "" . $locale->text('Date') . ""; - $column_data{paid} = "" . $locale->text('Amount') . ""; - $column_data{exchangerate} = "" . $locale->text('Exch') . ""; - $column_data{AP_paid} = "" . $locale->text('Account') . ""; - $column_data{source} = "" . $locale->text('Source') . ""; - $column_data{memo} = "" . $locale->text('Memo') . ""; - - print qq| - -|; - map { print "$column_data{$_}\n" } @column_index; - print qq| - -|; - - my @triggers = (); + # payments my $totalpaid = 0; - $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); - for my $i (1 .. $form->{paidaccounts}) { - - print qq| - -|; + $form->{paid_indices} = [ 1 .. $form->{paidaccounts} ]; + for my $i (1 .. $form->{paidaccounts}) { $form->{"selectAP_paid_$i"} = $form->{selectAP_paid}; - $form->{"selectAP_paid_$i"} =~ - s/option>\Q$form->{"AP_paid_$i"}\E/option selected>$form->{"AP_paid_$i"}/; - + $form->{"selectAP_paid_$i"} =~ s/option>\Q$form->{"AP_paid_$i"}\E/option selected>$form->{"AP_paid_$i"}/; $totalpaid += $form->{"paid_$i"}; - - # format amounts - 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"}); - - my $exchangerate = qq| |; - if ($form->{currency} ne $form->{defaultcurrency}) { - if ($form->{"forex_$i"}) { - $exchangerate = - qq|{"exchangerate_$i"}>$form->{"exchangerate_$i"}|; - } else { - $exchangerate = - qq|{"exchangerate_$i"}>|; - } - } - $exchangerate .= qq| -{"forex_$i"}> -|; - - $column_data{"paid_$i"} = - qq||; - $column_data{"exchangerate_$i"} = qq|$exchangerate|; - $column_data{"AP_paid_$i"} = - qq|$form->{"selectAP_paid_$i"}|; - $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 qq| - -|; - push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); } - my $paid_missing = $form->{oldinvtotal} - $totalpaid; - - print qq| - - - - | . $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| - - - {oldinvtotal}> - {paidaccounts}> - - - - - - - - - -|; - - my $invdate = $form->datetonum($form->{invdate}, \%myconfig); - my $closedto = $form->datetonum($form->{closedto}, \%myconfig); - - print qq| -|; - - if ($form->{id}) { - my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ap") && (($totalpaid == 0) || ($totalpaid eq "")); - - print qq| -|; - print qq| -| if ($show_storno); - if ($form->{radier}) { - print qq| - -|; - } - print qq| - -|; - - } - - if (!$form->{id} && ($invdate > $closedto)) { - print qq| | . - NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), - '-class' => 'submit')); - } - - print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers); - $form->hide_form(qw(rowcount callback draft_id draft_description vendor_discount)); - - # 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 qq| - -
$form->{saved_message}