X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fic.pl;h=faaa702dc0e196ca450db2d18267017e4c26cd2b;hb=1043d7f814fccf5864e677b1e38577d0a150026c;hp=710d1ec0ca0457d200bb9e14b44bac4cd03f268c;hpb=ec2e4394a02c907ca241fa6d87ee43f9a56e6308;p=kivitendo-erp.git diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index 710d1ec0c..faaa702dc 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -36,6 +36,7 @@ use List::Util qw(max); use List::MoreUtils qw(any); use SL::AM; +use SL::CVar; use SL::IC; use SL::ReportGenerator; @@ -45,7 +46,7 @@ use SL::ReportGenerator; #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"; @@ -105,6 +106,12 @@ sub search { $form->{jsscript} = 1; + $form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'IC'); + ($form->{CUSTOM_VARIABLES_FILTER_CODE}, + $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES}, + 'include_prefix' => 'l_', + 'include_value' => 'Y'); + $form->header; print $form->parse_html_template('ic/search', { %is_xyz, @@ -133,7 +140,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'); @@ -1010,12 +1017,14 @@ sub generate_report { my ($revers, $lastsort, $description); + my $cvar_configs = CVar->get_configs('module' => 'IC'); + $form->{title} = (ucfirst $form->{searchitems}) . "s"; $form->{title} =~ s/ys$/ies/; $form->{title} = $locale->text($form->{title}); - my $revers = $form->{revers}; - my $lastsort = $form->{lastsort}; + $revers = $form->{revers}; + $lastsort = $form->{lastsort}; # sorting and direction of sorting # ToDO: change this to the simpler field+direction method @@ -1151,6 +1160,12 @@ sub generate_report { 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 @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; + my @searchable_custom_variables = grep { $_->{searchable} } @{ $cvar_configs }; + my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables; + + push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables; + my %column_defs = ( 'bin' => { 'text' => $locale->text('Bin'), }, 'deliverydate' => { 'text' => $locale->text('deliverydate'), }, @@ -1177,12 +1192,13 @@ sub generate_report { '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; 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, map { "l_$_" } @columns); + my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, @searchable_custom_variables, map { "l_$_" } @columns); my $callback = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables); my @sort_full = qw(partnumber description onhand soldtotal deliverydate); @@ -1219,6 +1235,12 @@ sub generate_report { $report->set_sort_indicator($form->{sort}, $form->{revers} ? 0 : 1); + CVar->add_custom_variables_to_report('module' => 'IC', + 'trans_id_field' => '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; @@ -1272,7 +1294,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}); @@ -1488,7 +1510,7 @@ sub form_header { $auth->assert('part_service_assembly_edit'); - $form->{eur} = $eur; # config dumps into namespace - yuck + $form->{eur} = $main::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); @@ -1507,13 +1529,17 @@ 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(); $form->{fokus} = "ic.partnumber"; + $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} }); + $form->header; #print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS}, # ALL_UNITS => $form->{ALL_UNITS}, @@ -1548,13 +1574,12 @@ sub makemodel_row { sub assembly_row { $lxdebug->enter_sub(); my ($numrows) = @_; - my (@column_index, %column_data, %column_header); - my ($nochange, $callback, $previousform, $linetotal, $href); + my (@column_index); + my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href); - our ($deliverydate); # ToDO: cjeck if this indeed comes from global context + our ($deliverydate); # ToDO: check if this indeed comes from global context - @column_index = - qw(runningnumber qty unit bom partnumber description partsgroup lastcost total); + @column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total); if ($form->{previousform}) { $nochange = 1; @@ -1569,166 +1594,90 @@ sub assembly_row { # delete action map { delete $form->{$_} } qw(action header); - $previousform = ""; - # save form variables in a previousform variable - foreach my $key (sort keys %$form) { - next unless ref $form->{$key} eq '' && $form->{$key}; - next if $key =~ /^select/; # get rid of these stupid select things - - # escape ampersands - $form->{$key} =~ s/&/%26/g; - if (any { $key eq $_ } qw(sellprice listprice lastcost)) { - $previousform .= sprintf qq|%s=%s&|, $key, $form->format_amount(\%myconfig, $form->{$key}); - } else { - $previousform .= qq|$key=$form->{$key}&|; - } - } - chop $previousform; - $previousform = $form->escape($form->escape($previousform, 1)); - $form->{callback} = $callback; + $previousform = $form->escape($form->escape(join '&', map { + 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; $form->{assemblytotal} = 0; $form->{assembly_purchase_price_total} = 0; $form->{weight} = 0; - } - $column_header{runningnumber} = - qq|
| } - qw(qty unit partnumber description bom partsgroup); - } else { - - map { $column_data{$_} = qq| | | } qw(runningnumber unit bom); - - $column_data{qty} = - qq| | |; - $column_data{partnumber} = - qq| | |; - $column_data{description} = - qq| | |; - $column_data{partsgroup} = - qq| | |; - + if (!$form->{previousform}) { + $row{partnumber}{data} = qq||; + $row{qty}{data} = qq||; + $row{description}{data} = qq||; + $row{partsgroup}{data} = qq||; } - + # other rows } else { - if ($form->{previousform}) { - $column_data{partnumber} = - qq| | $form->{"partnumber_$i"} | |; - $column_data{qty} = - qq|$form->{"qty_$i"} | |; - - $column_data{bom} = - qq|{"bom_$i"}>|; - $column_data{bom} .= ($form->{"bom_$i"}) ? "x" : " "; - $column_data{bom} .= qq| | |; - - $column_data{partsgroup} = - qq|$form->{"partsgroup_$i"} | |; - + push @row_hiddens, qw(qty bom); + $row{partnumber}{data} = $form->{"partnumber_$i"}; + $row{qty}{data} = $form->{"qty_$i"}; + $row{bom}{data} = $form->{"bom_$i"} ? "x" : " "; + $row{qty}{align} = 'right'; } else { - $href = - qq|$form->{script}?action=edit&id=$form->{"id_$i"}&rowcount=$i&previousform=$previousform|; - $column_data{partnumber} = - qq|$form->{"partnumber_$i"} | |; - $column_data{runningnumber} = - qq||; - $column_data{qty} = - qq| | |; - - $form->{"bom_$i"} = ($form->{"bom_$i"}) ? "checked" : ""; - $column_data{bom} = - qq| | {"bom_$i"}> | |; - - $column_data{partsgroup} = - qq|$form->{"partsgroup_$i"} | |; + $row{partnumber}{data} = qq|$form->{"partnumber_$i"}|; + $row{qty}{data} = qq||; + $row{runningnumber}{data} = qq||; + $row{bom}{data} = sprintf qq||, + $form->{"bom_$i"} ? 'checked' : ''; } - - $column_data{unit} = - qq|$form->{"unit_$i"} | |; - $column_data{description} = - qq|$form->{"description_$i"} | |; + push @row_hiddens, qw(unit description partnumber partsgroup); + $row{unit}{data} = $form->{"unit_$i"}; + $row{description}{data} = $form->{"description_$i"}; + $row{partsgroup}{data} = $form->{"partsgroup_$i"}; + $row{bom}{align} = 'center'; } - $column_data{lastcost} = qq|$line_purchase_price | |; - $column_data{total} = qq|$linetotal | |; + $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'; - $column_data{deliverydate} = qq|$deliverydate | |; - - print qq| -