X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=c2f789a0145ee86898a85e558c8569e573f589fc;hb=358f1ed4ec3370dd9ffc7cb9505e7960fa719205;hp=eb9ca0f620aea6f261144a11d629bda440f5b3c8;hpb=e411fd61f5174cd315a083226bb5e2e071a2caf4;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index eb9ca0f62..c2f789a01 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 @@ -35,7 +38,7 @@ use CGI; use CGI::Ajax; -use List::Util qw(max first); +use List::Util qw(min max first); use SL::CVar; use SL::Common; @@ -111,6 +114,7 @@ sub display_row { my $is_purchase = (first { $_ eq $form->{type} } qw(request_quotation purchase_order purchase_delivery_order)) || ($form->{script} eq 'ir.pl'); my $show_min_order_qty = first { $_ eq $form->{type} } qw(request_quotation purchase_order); my $is_delivery_order = $form->{type} =~ /_delivery_order$/; + my $is_s_p_order = (first { $_ eq $form->{type} } qw(sales_order purchase_order)); if ($is_delivery_order) { $readonly = ' readonly' if ($form->{closed}); @@ -132,8 +136,7 @@ sub display_row { { id => 'runningnumber', width => 5, value => $locale->text('No.'), display => 1, }, { 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 => ($form->{type} eq 'purchase_order' ? $locale->text('Ship rcvd') : $locale->text('Ship')), - display => $form->{type} =~ /sales_order/ || ($form->{type} =~ /purchase_order/ && !($lizenzen && $form->{vc} eq "customer")) , }, + { id => 'ship', width => 5, value => $locale->text('Delivered'), display => $is_s_p_order, }, { id => 'qty', width => 5, value => $locale->text('Qty'), 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, }, @@ -188,11 +191,14 @@ sub display_row { $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"}; } + _update_part_information(); + _update_ship() if ($is_s_p_order); + # rows for $i (1 .. $numrows) { # undo formatting - map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty ship discount sellprice price_new price_old) unless ($form->{simple_save}); + map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty discount sellprice price_new price_old) unless ($form->{simple_save}); # unit begin $form->{"unit_old_$i"} ||= $form->{"unit_$i"}; @@ -232,9 +238,8 @@ sub display_row { $decimalplaces = max 2, length $1; $price_factor = $price_factors{$form->{"price_factor_id_$i"}} || 1; - $discount = $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, $decimalplaces); - $linetotal = $form->round_amount(($form->{"sellprice_$i"} - $discount) / $price_factor, $decimalplaces); - $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2); + $discount = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * $form->{"discount_$i"} / 100 / $price_factor, 2); + $linetotal = $form->round_amount($form->{"qty_$i"} * $form->{"sellprice_$i"} * (100 - $form->{"discount_$i"}) / 100 / $price_factor, 2); $column_data{runningnumber} = $cgi->textfield(-name => "runningnumber_$i", -size => 5, -value => $i); # HuT $column_data{partnumber} = $cgi->textfield(-name => "partnumber_$i", -size => 12, -value => $form->{"partnumber_$i"}); @@ -250,7 +255,15 @@ sub display_row { $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/')) . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"}) if $form->{"formel_$i"}; - $column_data{ship} = $cgi->textfield(-name => "ship_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"ship_$i"})); + + $column_data{ship} = ''; + if ($form->{"id_$i"}) { + my $ship_qty = $form->{"ship_$i"} * 1; + $ship_qty *= $all_units->{$form->{"partunit_$i"}}->{factor}; + $ship_qty /= $all_units->{$form->{"unit_$i"}}->{factor}; + + $column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"}; + } # build in drop down list for pricesgroups if ($form->{"prices_$i"}) { @@ -277,7 +290,12 @@ 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} = $form->{"inventory_accno_$i"} ? calculate_stock_in_out($i) : ' '; + # $main::lxdebug->dump(0, "debug", $form->{"inventory_accno_$i"}); + # meine debug-analyse war negativ (s.o.) - die variable war weder bei dienstleistung, erzeugnis noch ware gefüllt. + # bitte korrigieren, falls ich hier falsch liege. jb 19.3.2009 + + $column_data{stock_in_out} = calculate_stock_in_out($i); } my @ROW1 = map { value => $column_data{$_}, align => $align{$_}, nowrap => $nowrap{$_} }, @column_index; @@ -385,10 +403,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} = @@ -397,6 +416,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} = @@ -459,6 +482,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++; @@ -962,12 +991,12 @@ sub edit_e_mail { @hidden_keys = sort grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form; print $form->parse_html_template('generic/edit_email', - { title => $title, - a_filename => $attachment_filename, - subject => $subject, - _print_options_ => print_options('inline' => 1), - HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], - SHOW_BCC => $myconfig{role} eq 'admin' }); + { title => $title, + a_filename => $attachment_filename, + subject => $subject, + print_options => print_options('inline' => 1), + HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], + SHOW_BCC => $myconfig{role} eq 'admin' }); $lxdebug->leave_sub(); } @@ -1049,7 +1078,7 @@ sub print_options { ($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; @@ -1356,7 +1385,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); @@ -1454,26 +1484,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/^ //; } @@ -1839,8 +1872,71 @@ sub set_duedate { $form->get_duedate(\%myconfig); - print $cgi->header() . $form->{duedate}; + print $form->ajax_response_header() . $form->{duedate}; + + $lxdebug->leave_sub(); +} + +sub _update_part_information { + $lxdebug->enter_sub(); + + my %part_information = IC->get_basic_part_info('id' => [ grep { $_ } map { $form->{"id_${_}"} } (1..$form->{rowcount}) ], + 'vendor_id' => $form->{vendor_id}); + + $form->{PART_INFORMATION} = \%part_information; + + foreach my $i (1..$form->{rowcount}) { + next unless ($form->{"id_${i}"}); + + my $info = $form->{PART_INFORMATION}->{$form->{"id_${i}"}} || { }; + $form->{"partunit_${i}"} = $info->{unit}; + } $lxdebug->leave_sub(); } +sub _update_ship { + $lxdebug->enter_sub(); + + if (!$form->{ordnumber} || !$form->{id}) { + map { $form->{"ship_$_"} = 0 } (1..$form->{rowcount}); + $lxdebug->leave_sub(); + return; + } + + AM->retrieve_all_units(); + + my %ship = DO->get_shipped_qty('type' => ($form->{type} eq 'purchase_order') ? 'purchase' : 'sales', + 'oe_id' => $form->{id},); + + foreach my $i (1..$form->{rowcount}) { + next unless ($form->{"id_${i}"}); + + $form->{"ship_$i"} = 0; + + my $ship_entry = $ship{$form->{"id_$i"}}; + + next if (!$ship_entry || ($ship_entry->{qty} <= 0)); + + my $rowqty = + ($form->{simple_save} ? $form->{"qty_$i"} : $form->parse_amount(\%myconfig, $form->{"qty_$i"})) + * $all_units->{$form->{"unit_$i"}}->{factor} + / $all_units->{$form->{"partunit_$i"}}->{factor}; + + $form->{"ship_$i"} = min($rowqty, $ship_entry->{qty}); + $ship_entry->{qty} -= $form->{"ship_$i"}; + } + + foreach my $i (1..$form->{rowcount}) { + next unless ($form->{"id_${i}"}); + + my $ship_entry = $ship{$form->{"id_$i"}}; + + next if (!$ship_entry || ($ship_entry->{qty} <= 0.01)); + + $form->{"ship_$i"} += $ship_entry->{qty}; + $ship_entry->{qty} = 0; + } + + $lxdebug->leave_sub(); +}