X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=b5588be3b3952abde07dd264dac584f9780a112e;hb=d5440cc6f9cc5b2942458ce7480526e2b90b17a4;hp=07a00891760dbe9409fde62bfc16520086b7a1ce;hpb=b2f44e3d98cbbd622b1497c23602eb79e71a3c64;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 07a008917..b5588be3b 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -42,11 +42,11 @@ use SL::ReportGenerator; #use SL::PE; -# use strict; +use strict; #use warnings; # global imports -our ($form, $locale, %myconfig, $lxdebug); +our ($form, $locale, %myconfig, $lxdebug, $auth); require "bin/mozilla/io.pl"; require "bin/mozilla/invoice_io.pl"; @@ -78,7 +78,8 @@ sub add { $auth->assert('part_service_assembly_edit'); - $form->{title} = $locale->text('Add ' . ucfirst $form->{item}); + my $title = 'Add ' . ucfirst $form->{item}; + $form->{title} = $locale->text($title); $form->{callback} = "$form->{script}?action=add&item=$form->{item}" unless $form->{callback}; $form->{unit_changeable} = 1; @@ -127,6 +128,8 @@ sub search_update_prices { my $pricegroups = IC->get_pricegroups(\%myconfig, \%$form); + $form->{title} = $locale->text('Update Prices'); + $form->header; print $form->parse_html_template('ic/search_update_prices', { PRICE_ROWS => $pricegroups }); @@ -140,7 +143,7 @@ sub confirm_price_update { $auth->assert('part_service_assembly_edit'); my @errors = (); - my $value_found = false; + my $value_found = undef; foreach my $idx (qw(sellprice listprice), (1..$form->{price_rows})) { my $name = $idx =~ m/\d/ ? $form->{"pricegroup_${idx}"} : $idx eq 'sellprice' ? $locale->text('Sell Price') : $locale->text('List Price'); @@ -290,14 +293,14 @@ sub update_prices { # | . $locale->text('choice part') . qq| # # -# -#   -# | . $locale->text('Part Number') . qq| -# | . $locale->text('Part Description') . qq| -# | . $locale->text('Unit of measure') . qq| -# | . $locale->text('Sell Price') . qq| -# | . $locale->text('soldtotal') . qq| -# |; +# +#   +# | . $locale->text('Part Number') . qq| +# | . $locale->text('Part Description') . qq| +# | . $locale->text('Unit of measure') . qq| +# | . $locale->text('Sell Price') . qq| +# | . $locale->text('soldtotal') . qq| +# |; # # my $j = 0; # my $i = $form->{rows}; @@ -308,20 +311,20 @@ sub update_prices { # |; # if ($j == 1) { # print qq| -# |; +# |; # } else { # print qq| -# |; +# |; # } # print qq| -# $form->{"partnumber_$j"} -# $form->{"description_$j"} -# $form->{"unit_$j"} -# $form->{"sellprice_$j"} -# $form->{"soldtotal_$j"} +# $form->{"partnumber_$j"} +# $form->{"description_$j"} +# $form->{"unit_$j"} +# $form->{"sellprice_$j"} +# $form->{"soldtotal_$j"} # # -# |; +# |; # } # # print qq| @@ -789,7 +792,7 @@ sub addtop100 { if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) { if ($sameitem ne $ref->{ $form->{sort} }) { - &parts_subtotal; + parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice); $sameitem = $ref->{ $form->{sort} }; } } @@ -912,7 +915,7 @@ sub addtop100 { } if ($form->{l_subtotal} eq 'Y') { - &parts_subtotal; + parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice); } #fi if ($form->{"l_linetotal"}) { @@ -1023,8 +1026,37 @@ sub generate_report { $form->{title} =~ s/ys$/ies/; $form->{title} = $locale->text($form->{title}); - my $revers = $form->{revers}; - my $lastsort = $form->{lastsort}; + my %column_defs = ( + 'bin' => { 'text' => $locale->text('Bin'), }, + 'deliverydate' => { 'text' => $locale->text('deliverydate'), }, + 'description' => { 'text' => $locale->text('Part Description'), }, + 'drawing' => { 'text' => $locale->text('Drawing'), }, + 'image' => { 'text' => $locale->text('Image'), }, + 'invnumber' => { 'text' => $locale->text('Invoice Number'), }, + 'lastcost' => { 'text' => $locale->text('Last Cost'), }, + 'linetotallastcost' => { 'text' => $locale->text('Extended'), }, + 'linetotallistprice' => { 'text' => $locale->text('Extended'), }, + 'linetotalsellprice' => { 'text' => $locale->text('Extended'), }, + 'listprice' => { 'text' => $locale->text('List Price'), }, + 'microfiche' => { 'text' => $locale->text('Microfiche'), }, + 'name' => { 'text' => $locale->text('Name'), }, + 'onhand' => { 'text' => $locale->text('Qty'), }, + 'ordnumber' => { 'text' => $locale->text('Order Number'), }, + 'partnumber' => { 'text' => $locale->text('Part Number'), }, + 'partsgroup' => { 'text' => $locale->text('Group'), }, + 'priceupdate' => { 'text' => $locale->text('Updated'), }, + 'quonumber' => { 'text' => $locale->text('Quotation'), }, + 'rop' => { 'text' => $locale->text('ROP'), }, + 'sellprice' => { 'text' => $locale->text('Sell Price'), }, + 'serialnumber' => { 'text' => $locale->text('Serial Number'), }, + 'soldtotal' => { 'text' => $locale->text('soldtotal'), }, + 'transdate' => { 'text' => $locale->text('Transdate'), }, + 'unit' => { 'text' => $locale->text('Unit'), }, + 'weight' => { 'text' => $locale->text('Weight'), }, + ); + + $revers = $form->{revers}; + $lastsort = $form->{lastsort}; # sorting and direction of sorting # ToDO: change this to the simpler field+direction method @@ -1094,6 +1126,7 @@ sub generate_report { drawing => $locale->text('Drawing') . ": '$form->{drawing}'", microfiche => $locale->text('Microfiche') . ": '$form->{microfiche}'", l_soldtotal => $locale->text('soldtotal'), + ean => $locale->text('EAN') . ": '$form->{ean}'", ); my @itemstatus_keys = qw(active obsolete orphaned onhand short); @@ -1114,7 +1147,12 @@ sub generate_report { } # special case for lastcost - $form->{l_lastcost} = "" if $form->{ledgerchecks}; + if ($form->{ledgerchecks}){ + # ledgerchecks don't know about sellprice or lastcost. they just return a + # price. so rename sellprice to price, and drop lastcost. + $column_defs{sellprice}{text} = $locale->text('Price'); + $form->{l_lastcost} = "" + } if ($form->{description}) { $description = $form->{description}; @@ -1124,12 +1162,7 @@ sub generate_report { if ($form->{l_linetotal}) { $form->{l_onhand} = "Y"; $form->{l_linetotalsellprice} = "Y" if $form->{l_sellprice}; - if ($form->{l_lastcost}) { - $form->{l_linetotallastcost} = "Y"; - if (($form->{searchitems} eq 'assembly') && !$form->{bom}) { - $form->{l_linetotallastcost} = ""; - } - } + $form->{l_linetotallastcost} = $form->{searchitems} eq 'assembly' && !$form->{bom} ? "" : 'Y' if $form->{l_lastcost}; $form->{l_linetotallistprice} = "Y" if $form->{l_listprice}; } @@ -1156,9 +1189,12 @@ sub generate_report { IC->all_parts(\%myconfig, \%$form); - my @columns = - qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost - priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal deliverydate); + my @columns = qw( + partnumber description partsgroup bin onhand rop unit listprice + linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost + priceupdate weight image drawing microfiche invnumber ordnumber quonumber + transdate name serialnumber soldtotal deliverydate ean + ); my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs }; @@ -1166,36 +1202,8 @@ sub generate_report { push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables; - my %column_defs = ( - 'bin' => { 'text' => $locale->text('Bin'), }, - 'deliverydate' => { 'text' => $locale->text('deliverydate'), }, - 'description' => { 'text' => $locale->text('Part Description'), }, - 'drawing' => { 'text' => $locale->text('Drawing'), }, - 'image' => { 'text' => $locale->text('Image'), }, - 'invnumber' => { 'text' => $locale->text('Invoice Number'), }, - 'lastcost' => { 'text' => $locale->text('Last Cost'), }, - 'linetotallastcost' => { 'text' => $locale->text('Extended'), }, - 'linetotallistprice' => { 'text' => $locale->text('Extended'), }, - 'linetotalsellprice' => { 'text' => $locale->text('Extended'), }, - 'listprice' => { 'text' => $locale->text('List Price'), }, - 'microfiche' => { 'text' => $locale->text('Microfiche'), }, - 'name' => { 'text' => $locale->text('Name'), }, - 'onhand' => { 'text' => $locale->text('Qty'), }, - 'ordnumber' => { 'text' => $locale->text('Order Number'), }, - 'partnumber' => { 'text' => $locale->text('Part Number'), }, - 'partsgroup' => { 'text' => $locale->text('Group'), }, - 'priceupdate' => { 'text' => $locale->text('Updated'), }, - 'quonumber' => { 'text' => $locale->text('Quotation'), }, - 'rop' => { 'text' => $locale->text('ROP'), }, - 'sellprice' => { 'text' => $locale->text('Sell Price'), }, - 'serialnumber' => { 'text' => $locale->text('Serial Number'), }, - 'soldtotal' => { 'text' => $locale->text('soldtotal'), }, - 'unit' => { 'text' => $locale->text('Unit'), }, - 'weight' => { 'text' => $locale->text('Weight'), }, - %column_defs_cvars, - ); - - map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns; + %column_defs = (%column_defs,%column_defs_cvars); # nochmal die cvars als überschrift hinzufügen + map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns; map { $column_defs{$_}->{align} = 'right' } qw(onhand sellprice listprice lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal); my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, @searchable_custom_variables, map { "l_$_" } @columns); @@ -1227,6 +1235,7 @@ sub generate_report { 'attachment_basename' => $attachment_basenames{$form->{searchitems}} . strftime('_%Y%m%d', localtime time), ); $report->set_options_from_form(); + $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv'; $report->set_columns(%column_defs); $report->set_column_order(@columns); @@ -1241,6 +1250,13 @@ sub generate_report { 'column_defs' => \%column_defs, 'data' => $form->{parts}); + CVar->add_custom_variables_to_report('module' => 'IC', + 'sub_module' => sub { $_[0]->{ioi} }, + 'trans_id_field' => 'ioi_id', + 'configs' => $cvar_configs, + 'column_defs' => \%column_defs, + 'data' => $form->{parts}); + my @subtotal_columns = qw(sellprice listprice lastcost); my %subtotals = map { $_ => 0 } ('onhand', @subtotal_columns); my %totals = map { $_ => 0 } @subtotal_columns; @@ -1294,7 +1310,7 @@ sub generate_report { # set module stuff if ($ref->{module} eq 'oe') { - my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{customer_id} ne '' ? 'sales_order' : 'purchase_order'), 'id=' . E($ref->{trans_id}), 'callback'); + my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback'); $row->{ordnumber}{link} = $edit_oe_link; $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber}); @@ -1353,39 +1369,38 @@ sub parts_subtotal { $auth->assert('part_service_assembly_edit'); - # imports - our (%column_data, @column_index); - our ($subtotalonhand, $totalsellprice, $totallastcost, $totallistprice, $subtotalsellprice, $subtotallastcost, $subtotallistprice); + my (%column_data); + my ($column_index, $subtotalonhand, $subtotalsellprice, $subtotallastcost, $subtotallistprice) = @_; - map { $column_data{$_} = " " } @column_index; - $subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom}); + map { $column_data{$_} = " " } @{ $column_index }; + $$subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom}); $column_data{onhand} = "" - . $form->format_amount(\%myconfig, $subtotalonhand) + . $form->format_amount(\%myconfig, $$subtotalonhand) . ""; $column_data{linetotalsellprice} = "" - . $form->format_amount(\%myconfig, $subtotalsellprice, 2) + . $form->format_amount(\%myconfig, $$subtotalsellprice, 2) . ""; $column_data{linetotallistprice} = "" - . $form->format_amount(\%myconfig, $subtotallistprice, 2) + . $form->format_amount(\%myconfig, $$subtotallistprice, 2) . ""; $column_data{linetotallastcost} = "" - . $form->format_amount(\%myconfig, $subtotallastcost, 2) + . $form->format_amount(\%myconfig, $$subtotallastcost, 2) . ""; - $subtotalonhand = 0; - $subtotalsellprice = 0; - $subtotallistprice = 0; - $subtotallastcost = 0; + $$subtotalonhand = 0; + $$subtotalsellprice = 0; + $$subtotallistprice = 0; + $$subtotallastcost = 0; print ""; - map { print "\n$column_data{$_}" } @column_index; + map { print "\n$column_data{$_}" } @{ $column_index }; print qq| @@ -1406,7 +1421,8 @@ sub edit { $form->{"original_partnumber"} = $form->{"partnumber"}; - $form->{title} = $locale->text('Edit ' . ucfirst $form->{item}); + my $title = 'Edit ' . ucfirst $form->{item}; + $form->{title} = $locale->text($title); &link_part; &display_form; @@ -1510,7 +1526,7 @@ sub form_header { $auth->assert('part_service_assembly_edit'); - $form->{eur} = $eur; # config dumps into namespace - yuck + $form->{eur} = $::lx_office_conf{system}->{eur}; # config dumps into namespace - yuck $form->{pg_keys} = sub { "$_[0]->{partsgroup}--$_[0]->{id}" }; $form->{description_area} = ($form->{rows} = $form->numtextrows($form->{description}, 40)) > 1; $form->{notes_rows} = max 4, $form->numtextrows($form->{notes}, 40), $form->numtextrows($form->{formel}, 40); @@ -1529,7 +1545,7 @@ sub form_header { # use JavaScript Calendar or not (yes!) $form->{jsscript} = 1; - $units = AM->retrieve_units(\%myconfig, $form); + my $units = AM->retrieve_units(\%myconfig, $form); $form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ]; $form->{defaults} = AM->get_defaults(); @@ -1538,7 +1554,8 @@ sub form_header { $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'IC', 'trans_id' => $form->{id}); - CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}) if (scalar @{ $form->{CUSTOM_VARIABLES} }); + CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}, show_disabled_message => 1) + if (scalar @{ $form->{CUSTOM_VARIABLES} }); $form->header; #print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS}, @@ -1563,8 +1580,8 @@ sub form_footer { sub makemodel_row { $lxdebug->enter_sub(); my ($numrows) = @_; - - my @mm_data = grep { any { $_ ne '' } @$_{qw(make model)} } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"} }, 1 .. $numrows; + #hli + my @mm_data = grep { any { $_ ne '' } @$_{qw(make model)} } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"}, lastcost => $form->{"lastcost_$_"}, lastupdate => $form->{"lastupdate_$_"}, sortorder => $form->{"sortorder_$_"} }, 1 .. $numrows; delete @{$form}{grep { m/^make_\d+/ || m/^model_\d+/ } keys %{ $form }}; print $form->parse_html_template('ic/makemodel', { MM_DATA => [ @mm_data, {} ], mm_rows => scalar @mm_data + 1 }); @@ -1577,8 +1594,6 @@ sub assembly_row { my (@column_index); my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href); - our ($deliverydate); # ToDO: cjeck if this indeed comes from global context - @column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total); if ($form->{previousform}) { @@ -1596,7 +1611,7 @@ sub assembly_row { # save form variables in a previousform variable $previousform = $form->escape($form->escape(join '&', map { - sprintf "%s=%s", Q($_), /^listprice|lastcost|sellprice$/ ? $form->format_amount(\%myconfig, $form->{$key}) : $form->{$key} + sprintf "%s=%s", Q($_), /^listprice|lastcost|sellprice$/ ? $form->format_amount(\%myconfig, $form->{$_}) : $form->{$_} } grep { ref $form->{$_} eq '' && $form->{$_} } grep { !/^select/ } sort keys %$form )); $form->{callback} = $callback; @@ -1666,7 +1681,6 @@ sub assembly_row { $row{lastcost}{data} = $line_purchase_price; $row{total}{data} = $linetotal; - $row{deliverydate}{data} = $deliverydate; $row{lastcost}{align} = 'right'; $row{total}{align} = 'right'; $row{deliverydate}{align} = 'right'; @@ -1710,7 +1724,7 @@ sub update { if ($rows > 1) { $form->{makemodel_rows}--; &select_item; - exit; + ::end_of_request(); } else { map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit partsgroup); @@ -1753,13 +1767,8 @@ sub save { # check if there is a description $form->isblank("description", $locale->text("Part Description missing!")); - if ($form->{obsolete}) { - $form->error( - $locale->text( - "Inventory quantity must be zero before you can set this $form->{item} obsolete!" - )) - if ($form->{onhand} * 1); - } + $form->error($locale->text("Inventory quantity must be zero before you can set this $form->{item} obsolete!")) + if $form->{obsolete} && $form->{onhand} * 1 && $form->{item} ne 'service'; if (!$form->{buchungsgruppen_id}) { $form->error($locale->text("Parts must have an entry type.") . " " . @@ -1778,8 +1787,8 @@ sub save { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|partnumber_| . $form->{partnumber}; - $form->{addition} = "SAVED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED"; + $form->save_history; } # /saving the history $parts_id = $form->{id}; @@ -1796,6 +1805,9 @@ sub save { # don't trample on previous variables map { delete $form->{$_} } keys %newform; + my $ic_cvar_configs = CVar->get_configs(module => 'IC'); + my @ic_cvar_fields = map { "cvar_$_->{name}" } @{ $ic_cvar_configs }; + # now take it apart and restore original values foreach my $item (split /&/, $previousform) { my ($key, $value) = split m/=/, $item, 2; @@ -1819,6 +1831,7 @@ sub save { # change/add values for assembly item map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit weight listprice sellprice inventory_accno income_accno expense_accno price_factor_id); + map { $form->{"ic_${_}_$i"} = $newform{$_} } @ic_cvar_fields; # das ist __voll__ bekloppt, dass so auszurechnen jb 22.5.09 #$form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"}; @@ -1831,6 +1844,7 @@ sub save { $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"}); map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice lastcost price_factor_id); + map { $form->{"ic_${_}_$i"} = $newform{$_} } @ic_cvar_fields; $form->{"longdescription_$i"} = $newform{notes}; @@ -1858,7 +1872,7 @@ sub save { $form->{creditremaining} -= $amount; # redo number formatting, because invoice parse them! - map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } qw(weight listprice sellprice rop); + map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } qw(weight listprice sellprice lastcost rop); } $form->{"id_$i"} = $parts_id; @@ -1906,8 +1920,8 @@ sub save_as_new { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|partnumber_| . $form->{partnumber}; - $form->{addition} = "SAVED AS NEW"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "SAVED AS NEW"; + $form->save_history; } # /saving the history $form->{id} = 0; @@ -1927,8 +1941,8 @@ sub delete { # saving the history if(!exists $form->{addition}) { $form->{snumbers} = qq|partnumber_| . $form->{partnumber}; - $form->{addition} = "DELETED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "DELETED"; + $form->save_history; } # /saving the history my $rc = IC->delete(\%myconfig, \%$form); @@ -1963,12 +1977,10 @@ sub parts_language_selection { $auth->assert('part_service_assembly_edit'); - our ($onload); - my $languages = IC->retrieve_languages(\%myconfig, $form); if ($form->{language_values} ne "") { - foreach $item (split(/---\+\+\+---/, $form->{language_values})) { + foreach my $item (split(/---\+\+\+---/, $form->{language_values})) { my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item); foreach my $language (@{ $languages }) { @@ -1989,17 +2001,34 @@ sub parts_language_selection { my @header = map(+{ "column_title" => $header_title{$_}, "column" => $_, - "callback" => $callback, }, @header_sort); $form->{"title"} = $locale->text("Language Values"); $form->header(); print $form->parse_html_template("ic/parts_language_selection", { "HEADER" => \@header, - "LANGUAGES" => $languages, - "onload" => $onload }); + "LANGUAGES" => $languages, }); $lxdebug->leave_sub(); } +sub ajax_autocomplete { + $main::lxdebug->enter_sub(); + + my $form = $main::form; + my %myconfig = %main::myconfig; + + $form->{column} = 'description' unless $form->{column} =~ /^partnumber|description$/; + $form->{$form->{column}} = $form->{q} || ''; + $form->{limit} = ($form->{limit} * 1) || 10; + $form->{searchitems} ||= ''; + + my @results = IC->all_parts(\%myconfig, $form); + + print $form->ajax_response_header(), + $form->parse_html_template('ic/ajax_autocomplete'); + + $main::lxdebug->leave_sub(); +} + sub continue { call_sub($form->{"nextsub"}); }