X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=850db5febe68094fad8802eaab3a28bc8ba59d1e;hb=a325f1b7554914418f885c43211099baa0ce083c;hp=a15f2acb880a3023f8ef0aa1e29d551b1e1e30cb;hpb=08ca74a8fe8fc1f9e528b0cc1172062c80283a36;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index a15f2acb8..850db5feb 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -4,7 +4,10 @@ # Based on SQL-Ledger Version 2.1.9 # Web http://www.lx-office.org ############################################################################# -# Veraendert 2005-01-05 - Marco Welter - Neue Optik # +# Changelog: Wann - Wer - Was +# Veraendert 2005-01-05 - Marco Welter - Neue Optik +# 08.11.2008 - information@richardson-bueren.de jb - Backport von Revision 7339 xplace - E-Mail-Vorlage automatisch auswählen +# 02.02.2009 - information@richardson-bueren.de jb - Backport von Revision 8535 xplace - Erweiterung der Waren bei Lieferantenauftrag um den Eintrag Mindestlagerbestand. Offen: Auswahlliste auf Lieferantenaufträge einschränken -> Erledigt 2.2.09 Prüfung wie das Skript heisst (oe.pl) -> das ist nur die halbe Miete, nochmal mb fragen -> mb gefragt und es gibt die variable is_purchase ############################################################################# # SQL-Ledger, Accounting # Copyright (c) 1998-2002 @@ -134,7 +137,7 @@ sub display_row { { id => 'partnumber', width => 8, value => $locale->text('Number'), display => 1, }, { id => 'description', width => 30, value => $locale->text('Part Description'), display => 1, }, { id => 'ship', width => 5, value => $locale->text('Delivered'), display => $is_s_p_order, }, - { id => 'qty', width => 5, value => $locale->text('Qty'), display => 1, }, + { id => 'qty', width => 5, value => $locale->text('Wo bin ich'), display => 1, }, { id => 'price_factor', width => 5, value => $locale->text('Price Factor'), display => !$is_delivery_order, }, { id => 'unit', width => 5, value => $locale->text('Unit'), display => 1, }, { id => 'license', width => 10, value => $locale->text('License'), display => 0, }, @@ -142,11 +145,11 @@ sub display_row { { id => 'projectnr', width => 10, value => $locale->text('Project'), display => 0, }, { id => 'sellprice', width => 15, value => $locale->text('Price'), display => !$is_delivery_order, }, { id => 'sellprice_pg', width => 8, value => $locale->text('Pricegroup'), display => ($form->{type} =~ /^sales_/) && !$is_delivery_order, }, - { id => 'discount', width => 5, value => $locale->text('Discount'), display => ($form->{vc} eq 'customer') && !$is_delivery_order, }, + { id => 'discount', width => 5, value => $locale->text('Discount'), display => !$is_delivery_order, }, { id => 'linetotal', width => 10, value => $locale->text('Extended'), display => !$is_delivery_order, }, { id => 'bin', width => 10, value => $locale->text('Bin'), display => 0, }, { id => 'stock_in_out', width => 10, value => $stock_in_out_title, display => $is_delivery_order, }, - ); + ); my @column_index = map { $_->{id} } grep { $_->{display} } @HEADER; # cache units @@ -159,7 +162,7 @@ sub display_row { $form->{invsubtotal} = 0; map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts})); - # about details + # about details $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details})); $form->{show_details} = $myconfig{show_form_details} unless (defined($form->{show_details})); # /about details @@ -287,20 +290,20 @@ sub display_row { $column_data{bin} = $form->{"bin_$i"}; if ($is_delivery_order) { - $column_data{stock_in_out} = (!$form->{"assembly_$i"} && $form->{"inventory_accno_$i"}) ? calculate_stock_in_out($i) : ' '; + $column_data{stock_in_out} = calculate_stock_in_out($i); } my @ROW1 = map { value => $column_data{$_}, align => $align{$_}, nowrap => $nowrap{$_} }, @column_index; # second row my @ROW2 = (); - push @ROW2, { value => qq|$serialnumber | } + push @ROW2, { value => qq|$serialnumber | } if $form->{type} !~ /_quotation/; push @ROW2, { value => qq|$projectnumber | . NTI($cgi->popup_menu('-name' => "project_id_$i", '-values' => \@projectnumber_values, '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"})) }; push @ROW2, { value => qq|$reqdate | } if ($form->{type} =~ /order/ || $form->{type} =~ /invoice/); - push @ROW2, { value => sprintf qq|%s |, + push @ROW2, { value => sprintf qq|%s |, $locale->text('Subtotal'), $form->{"subtotal_$i"} ? 'checked' : '' }; # begin marge calculations @@ -343,7 +346,7 @@ sub display_row { my @HIDDENS = map { value => $_}, ( $cgi->hidden("-name" => "unit_old_$i", "-value" => $form->{"selected_unit_$i"}), $cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})), - map { ($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } map { $_."_$i" } + map { ($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } map { $_."_$i" } (qw(orderitems_id bo pricegroup_old price_old id inventory_accno bin partsgroup partnotes income_accno expense_accno listprice assembly taxaccounts ordnumber transdate cusordnumber longdescription basefactor marge_absolut marge_percent marge_price_factor lastcost), @hidden_vars) @@ -380,7 +383,7 @@ sub set_pricegroup { next unless $form->{PRICES}{$j}; # build drop down list for pricegroups my $option_tmpl = qq||; - $form->{"prices_$j"} = join '', map { sprintf $option_tmpl, @$_{qw(price pricegroup_id selected pricegroup)} } + $form->{"prices_$j"} = join '', map { sprintf $option_tmpl, @$_{qw(price pricegroup_id selected pricegroup)} } (+{ pricegroup => $locale->text("none (pricegroup)") }, @{ $form->{PRICES}{$j} }); foreach $item (@{ $form->{PRICES}{$j} }) { @@ -395,10 +398,11 @@ sub set_pricegroup { sub select_item { $lxdebug->enter_sub(); - +# diese variable kommt schon in der methode display_row vor, kann man die besser wiederverwenden? @mb fragen. ich check das jetzt erstmal so ein + my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl'); _check_io_auth(); - @column_index = qw(ndx partnumber description onhand unit sellprice); + @column_index = qw(ndx partnumber description rop onhand unit sellprice); $column_data{ndx} = qq| |; $column_data{partnumber} = @@ -407,6 +411,10 @@ sub select_item { qq|| . $locale->text('Part Description') . qq||; $column_data{sellprice} = qq|| . $locale->text('Price') . qq||; + if ($is_purchase){ + $column_data{rop} = + qq|| . $locale->text('ROP') . qq||; + }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten $column_data{onhand} = qq|| . $locale->text('Qty') . qq||; $column_data{unit} = @@ -469,6 +477,12 @@ sub select_item { qq|| . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") . qq||; + if ($is_purchase){ + $column_data{rop} = + qq|| + . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") + . qq||; + }# ende if $is_purchase -> Falls der Aufruf über eine Einkaufsmaske kam, handelt es sich um einen Lieferantenauftrag und uns interessiert auch die Mindestbestandsmenge $column_data{unit} = qq|$ref->{unit}|; $j++; @@ -581,7 +595,7 @@ sub item_selected { $form->{sellprice} += ($form->{"sellprice_$i"} * $form->{"qty_$i"}); $form->{weight} += ($form->{"weight_$i"} * $form->{"qty_$i"}); - + if ($form->{"not_discountable_$i"}) { $form->{"discount_$i"} = 0; } @@ -665,7 +679,7 @@ sub check_form { not_discountable shop ve gv buchungsgruppen_id language_values sellprice_pg pricegroup_old price_old price_new unit_old ordnumber transdate longdescription basefactor marge_total marge_percent - marge_price_factor lastcost price_factor_id + marge_price_factor lastcost price_factor_id partnotes stock_out stock_in); # remove any makes or model rows @@ -1003,10 +1017,10 @@ sub send_email { # generate the printing options displayed at the bottom of oe and is forms. # this function will attempt to guess what type of form is displayed, and will generate according options # -# about the coding: +# about the coding: # this version builds the arrays of options pretty directly. if you have trouble understanding how, # the opthash function builds hashrefs which are then pieced together for the template arrays. -# unneeded options are "undef"ed out, and then grepped out. +# unneeded options are "undef"ed out, and then grepped out. # # the inline options is untested, but intended to be used later in metatemplating sub print_options { @@ -1036,7 +1050,7 @@ sub print_options { push @FORMNAME, grep $_, ($form->{type} eq 'purchase_order') ? ( opthash("purchase_order", $form->{PD}{purchase_order}, $locale->text('Purchase Order')), - opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List')) + opthash("bin_list", $form->{PD}{bin_list}, $locale->text('Bin List')) ) : undef, ($form->{type} eq 'credit_note') ? opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef, @@ -1054,16 +1068,16 @@ sub print_options { ) : undef, ($form->{type} eq 'invoice' && $form->{storno}) ? ( opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')), - opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List')) + opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List')) ) : undef, ($form->{type} =~ /_delivery_order$/) ? ( opthash($form->{type}, $form->{PD}{$form->{type}}, $locale->text('Delivery Order')), opthash('pick_list', $form->{PD}{pick_list}, $locale->text('Pick List')), - ) : undef; + ) : undef, ($form->{type} eq 'credit_note') ? opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef; - push @SENDMODE, + push @SENDMODE, opthash("attachment", $form->{SM}{attachment}, $locale->text('Attachment')), opthash("inline", $form->{SM}{inline}, $locale->text('In-line')) if ($form->{media} eq 'email'); @@ -1089,11 +1103,11 @@ sub print_options { ($opendocument_templates && !$options{no_opendocument}) ? opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef; - push @LANGUAGE_ID, + push @LANGUAGE_ID, map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} } if (ref $form->{languages} eq 'ARRAY'); - push @PRINTER_ID, + push @PRINTER_ID, map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} } if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } }); @@ -1222,7 +1236,7 @@ sub print_form { $form->{invdate} = $form->{"${inv}date"} = $form->{transdate}; $form->{label} = $locale->text('Packing List'); $order = 1; - # set invnumber for template packing_list + # set invnumber for template packing_list $form->{invnumber} = $form->{ordnumber}; } if ($form->{formname} eq 'purchase_order') { @@ -1279,7 +1293,7 @@ sub print_form { $form->isblank("email", $locale->text('E-mail address missing!')) if ($form->{media} eq 'email'); $form->isblank("${inv}date", - $locale->text($form->{label}) + $locale->text($form->{label}) . ": " . $locale->text(' Date missing!')); @@ -1309,7 +1323,7 @@ sub print_form { call_sub($display_form); # saving the history if(!exists $form->{addition}) { - $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "PRINTED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1366,7 +1380,8 @@ sub print_form { IS->invoice_details(\%myconfig, \%$form, $locale); } - $form->get_salesman(\%myconfig, $salesman_id_saved); + $form->get_employee_data('prefix' => 'employee', 'id' => $form->{employee_id}); + $form->get_employee_data('prefix' => 'salesman', 'id' => $salesman_id_saved); if ($form->{shipto_id}) { $form->get_shipto(\%myconfig); @@ -1464,26 +1479,29 @@ sub print_form { reformat_numbers($output_numberformat, $precision, @{ $field_list }); } - $form->{IN} = "$form->{formname}$form->{language}${printer_code}.html"; + my $extension = ''; if ($form->{format} eq 'postscript') { - $form->{postscript} = 1; - $form->{IN} =~ s/html$/tex/; + $form->{postscript} = 1; + $extension = 'tex'; + } elsif ($form->{"format"} =~ /pdf/) { - $form->{pdf} = 1; - if ($form->{"format"} =~ /opendocument/) { - $form->{IN} =~ s/html$/odt/; - } else { - $form->{IN} =~ s/html$/tex/; - } + $form->{pdf} = 1; + $extension = $form->{'format'} =~ m/opendocument/i ? 'odt' : 'tex'; + } elsif ($form->{"format"} =~ /opendocument/) { - $form->{"opendocument"} = 1; - $form->{"IN"} =~ s/html$/odt/; + $form->{opendocument} = 1; + $extension = 'odt'; } + my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}")); + + $form->{IN} = "$form->{formname}${email_extension}$form->{language}${printer_code}.${extension}"; + delete $form->{OUT}; if ($form->{media} eq 'printer') { - $form->{OUT} = "| $form->{printer_command} &>/dev/null"; + #$form->{OUT} = "| $form->{printer_command} &>/dev/null"; + $form->{OUT} = "| $form->{printer_command} "; $form->{printed} .= " $form->{formname}"; $form->{printed} =~ s/^ //; } @@ -1591,7 +1609,7 @@ sub print_form { } if ($form->{printing}) { call_sub($display_form); - exit; + exit; } $lxdebug->leave_sub(); @@ -1847,9 +1865,10 @@ sub set_duedate { _check_io_auth(); - $form->get_duedate(\%myconfig); + my $invdate = $form->{invdate} eq 'undefined' ? undef : $form->{invdate}; + my $duedate = $form->get_duedate(\%myconfig, $invdate); - print $form->ajax_response_header() . $form->{duedate}; + print $form->ajax_response_header() . $duedate; $lxdebug->leave_sub(); } @@ -1875,7 +1894,7 @@ sub _update_part_information { sub _update_ship { $lxdebug->enter_sub(); - if (!$form->{ordnumber}) { + if (!$form->{ordnumber} || !$form->{id}) { map { $form->{"ship_$_"} = 0 } (1..$form->{rowcount}); $lxdebug->leave_sub(); return;