X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=51326c4b1843cd87d55143a7ffb0a7c9be9afe6c;hb=1043d7f814fccf5864e677b1e38577d0a150026c;hp=eb26778e88c5171fc5ffcda8dd5c724ff90baacf;hpb=4f63ea874f629459e1a73643595ab5e23e38e7f0;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index eb26778e8..51326c4b1 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -5,8 +5,8 @@ # Web http://www.lx-office.org ############################################################################# # 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 +# 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 @@ -144,12 +144,12 @@ sub display_row { { id => 'serialnr', width => 10, value => $locale->text('Serial No.'), display => 0, }, { 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 => 'sellprice_pg', width => 8, value => $locale->text('Pricegroup'), display => ($form->{type} =~ /^sales_/) && !$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 @@ -162,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 @@ -193,9 +193,11 @@ sub display_row { _update_part_information(); _update_ship() if ($is_s_p_order); + _update_custom_variables(); # rows for $i (1 .. $numrows) { + my %column_data = (); # undo formatting map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty discount sellprice price_new price_old) unless ($form->{simple_save}); @@ -260,7 +262,7 @@ sub display_row { 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}; + $ship_qty /= ( $all_units->{$form->{"unit_$i"}}->{factor} || 1 ); $column_data{ship} = $form->format_amount(\%myconfig, $form->round_amount($ship_qty, 2) * 1) . ' ' . $form->{"unit_$i"}; } @@ -290,20 +292,20 @@ sub display_row { $column_data{bin} = $form->{"bin_$i"}; if ($is_delivery_order) { - $column_data{stock_in_out} = $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 @@ -335,6 +337,19 @@ sub display_row { if $form->{"id_$i"} && ($form->{type} =~ /^sales_/ || $form->{type} =~ /invoice/) && !$is_delivery_order; # / marge calculations ending +# calculate onhand + if ($form->{"id_$i"}) { + my $part = IC->get_basic_part_info(id => $form->{"id_$i"}); + my $onhand_color = 'color="#ff0000"' if $part->{onhand} < $part->{rop}; + push @ROW2, { value => sprintf "%s %s %s", + $locale->text('On Hand'), + $onhand_color, + $form->format_amount(\%myconfig, $part->{onhand}, 2), + $part->{unit} + }; + } +# / calculate onhand + my @hidden_vars; if ($is_delivery_order) { @@ -346,7 +361,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) @@ -356,6 +371,9 @@ sub display_row { $form->{invsubtotal} += $linetotal; + # Benutzerdefinierte Variablen für Waren/Dienstleistungen/Erzeugnisse + _render_custom_variables_inputs(ROW2 => \@ROW2, row => $i); + push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, error => $form->{"row_error_$i"}, }; } @@ -383,7 +401,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} }) { @@ -411,7 +429,7 @@ sub select_item { qq|| . $locale->text('Part Description') . qq||; $column_data{sellprice} = qq|| . $locale->text('Price') . qq||; - if ($is_purchase){ + if ($is_purchase){ $column_data{rop} = qq|| . $locale->text('ROP') . qq||; }# ende if $is_purchase -> Überschrift Mindestlagerbestand - ähnliche Prüfung weiter unten @@ -441,6 +459,13 @@ sub select_item { print qq||; + my @new_fields = + qw(bin listprice inventory_accno income_accno expense_accno unit weight + assembly taxaccounts partsgroup formel longdescription not_discountable + part_payment_id partnotes id lastcost price_factor_id price_factor); + push @new_fields, "lizenzen" if ($lizenzen); + push @new_fields, grep { m/^ic_cvar_/ } keys %{ $form->{item_list}->[0] }; + my $i = 0; foreach $ref (@{ $form->{item_list} }) { $checked = ($i++) ? "" : "checked"; @@ -477,7 +502,7 @@ sub select_item { qq|| . $form->format_amount(\%myconfig, $ref->{onhand}, '', " ") . qq||; - if ($is_purchase){ + if ($is_purchase){ $column_data{rop} = qq|| . $form->format_amount(\%myconfig, $ref->{rop}, '', " ") @@ -494,12 +519,6 @@ sub select_item { print("\n"); - my @new_fields = - qw(bin listprice inventory_accno income_accno expense_accno unit weight - assembly taxaccounts partsgroup formel longdescription not_discountable - part_payment_id partnotes id lastcost price_factor_id price_factor); - push(@new_fields, "lizenzen") if ($lizenzen); - print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields; print "\n"; } @@ -562,6 +581,9 @@ sub item_selected { partsgroup formel longdescription not_discountable partnotes lastcost price_factor_id price_factor); + my $ic_cvar_configs = CVar->get_configs(module => 'IC'); + push @new_fields, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; + map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } @new_fields; $form->{"marge_price_factor_$i"} = $form->{"new_price_factor_$j"}; @@ -595,7 +617,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; } @@ -672,16 +694,6 @@ sub check_form { my @a = (); my $count = 0; - my @flds = qw(id partnumber description qty ship sellprice unit - discount inventory_accno income_accno expense_accno listprice - taxaccounts bin assembly weight projectnumber project_id - oldprojectnumber runningnumber serialnumber partsgroup payment_id - 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 - stock_out stock_in); - # remove any makes or model rows if ($form->{item} eq 'part') { map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } @@ -689,13 +701,13 @@ sub check_form { } elsif ($form->{item} eq 'assembly') { - $form->{sellprice} = 0; + # fuer assemblies auskommentiert. seiteneffekte? ;-) wird die woanders benoetigt? + #$form->{sellprice} = 0; $form->{weight} = 0; map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } - qw(listprice rop stock); + qw(listprice sellprice rop stock); - @flds = - qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup); + my @flds = qw(id qty unit bom partnumber description sellprice weight runningnumber partsgroup lastcost); for my $i (1 .. ($form->{assembly_rows} - 1)) { if ($form->{"qty_$i"}) { @@ -708,12 +720,13 @@ sub check_form { #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"}; - $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"}); - $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"}); + # fuer assemblies auskommentiert. siehe oben + # $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1)); + $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1)); $count++; } } - + # kann das hier auch weg? s.o. jb $form->{sellprice} = $form->round_amount($form->{sellprice}, 2); $form->redo_rows(\@flds, \@a, $count, $form->{assembly_rows}); @@ -723,6 +736,18 @@ sub check_form { map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost); } else { + my @flds = qw(id partnumber description qty ship sellprice unit + discount inventory_accno income_accno expense_accno listprice + taxaccounts bin assembly weight projectnumber project_id + oldprojectnumber runningnumber serialnumber partsgroup payment_id + 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 partnotes + stock_out stock_in has_sernumber); + + my $ic_cvar_configs = CVar->get_configs(module => 'IC'); + push @flds, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; # this section applies to invoices and orders # remove any empty numbers @@ -883,7 +908,7 @@ sub order { for $i (1 .. $form->{rowcount}) { map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } - qw(ship qty sellprice listprice basefactor)); + qw(ship qty sellprice listprice basefactor discount)); } &prepare_order; @@ -939,7 +964,7 @@ sub quotation { map({ $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } - qw(ship qty sellprice listprice basefactor)); + qw(ship qty sellprice listprice basefactor discount)); } &prepare_order; @@ -1017,10 +1042,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 { @@ -1050,7 +1075,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, @@ -1068,16 +1093,14 @@ 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, - ($form->{type} eq 'credit_note') ? - opthash("credit_note", $form->{PD}{credit_note}, $locale->text('Credit Note')) : undef; + ) : 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'); @@ -1103,11 +1126,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 } }); @@ -1236,7 +1259,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') { @@ -1293,7 +1316,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!')); @@ -1323,7 +1346,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)); } @@ -1387,7 +1410,7 @@ sub print_form { $form->get_shipto(\%myconfig); } - @a = qw(name street zipcode city country); + @a = qw(name street zipcode city country contact); $shipto = 1; @@ -1479,7 +1502,7 @@ sub print_form { reformat_numbers($output_numberformat, $precision, @{ $field_list }); } - my $extension = ''; + my $extension = 'html'; if ($form->{format} eq 'postscript') { $form->{postscript} = 1; $extension = 'tex'; @@ -1500,7 +1523,8 @@ sub print_form { 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/^ //; } @@ -1608,7 +1632,7 @@ sub print_form { } if ($form->{printing}) { call_sub($display_form); - exit; + exit; } $lxdebug->leave_sub(); @@ -1864,9 +1888,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(); } @@ -1934,3 +1959,47 @@ sub _update_ship { $lxdebug->leave_sub(); } + +sub _update_custom_variables { + $lxdebug->enter_sub(); + + $form->{CVAR_CONFIGS} ||= { }; + $form->{CVAR_CONFIGS}->{IC} = CVar->get_configs(module => 'IC'); + + $lxdebug->leave_sub(); +} + +sub _render_custom_variables_inputs { + $lxdebug->enter_sub(); + + my %params = @_; + + if (!$form->{CVAR_CONFIGS}->{IC}) { + $lxdebug->leave_sub(); + return; + } + + foreach my $cvar (@{ $form->{CVAR_CONFIGS}->{IC} }) { + $cvar->{value} = $form->{"ic_cvar_" . $cvar->{name} . "_$params{row}"}; + } + + CVar->render_inputs(hide_non_editable => 1, + variables => $form->{CVAR_CONFIGS}->{IC}, + name_prefix => 'ic_', + name_postfix => "_$params{row}"); + + my $num_visible_cvars = 0; + foreach my $cvar (@{ $form->{CVAR_CONFIGS}->{IC} }) { + my $description = ''; + if ($cvar->{flag_editable}) { + $num_visible_cvars++; + $description = $cvar->{description} . ' '; + } + + push @{ $params{ROW2} }, { line_break => $num_visible_cvars == 1, + value => $description . $cvar->{HTML_CODE}, + }; + } + + $lxdebug->leave_sub(); +}