#======================================================================
use POSIX qw(strftime);
-use List::Util qw(max);
+use List::Util qw(first max);
use List::MoreUtils qw(any);
use SL::AM;
$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;
$form->header;
+ $form->get_lists('partsgroup' => 'ALL_PARTSGROUPS');
print $form->parse_html_template('ic/search', { %is_xyz,
- dateformat => $myconfig{dateformat}, });
+ dateformat => $myconfig{dateformat},
+ limit => $myconfig{vclimit}, });
$lxdebug->leave_sub();
} #end search()
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 });
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} };
}
}
}
if ($form->{l_subtotal} eq 'Y') {
- &parts_subtotal;
+ parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice);
} #fi
if ($form->{"l_linetotal"}) {
'deliverydate' => { 'text' => $locale->text('deliverydate'), },
'description' => { 'text' => $locale->text('Part Description'), },
'drawing' => { 'text' => $locale->text('Drawing'), },
+ 'ean' => { 'text' => $locale->text('EAN'), },
'image' => { 'text' => $locale->text('Image'), },
'invnumber' => { 'text' => $locale->text('Invoice Number'), },
'lastcost' => { 'text' => $locale->text('Last Cost'), },
'listprice' => { 'text' => $locale->text('List Price'), },
'microfiche' => { 'text' => $locale->text('Microfiche'), },
'name' => { 'text' => $locale->text('Name'), },
- 'onhand' => { 'text' => $locale->text('Qty'), },
+ 'onhand' => { 'text' => $locale->text('Stocked Qty'), },
'ordnumber' => { 'text' => $locale->text('Order Number'), },
'partnumber' => { 'text' => $locale->text('Part Number'), },
'partsgroup' => { 'text' => $locale->text('Group'), },
'rop' => { 'text' => $locale->text('ROP'), },
'sellprice' => { 'text' => $locale->text('Sell Price'), },
'serialnumber' => { 'text' => $locale->text('Serial Number'), },
- 'soldtotal' => { 'text' => $locale->text('soldtotal'), },
+ 'soldtotal' => { 'text' => $locale->text('Qty in Selected Records'), },
'transdate' => { 'text' => $locale->text('Transdate'), },
'unit' => { 'text' => $locale->text('Unit'), },
'weight' => { 'text' => $locale->text('Weight'), },
+ 'projectnumber' => { 'text' => $locale->text('Project Number'), },
+ 'projectdescription' => { 'text' => $locale->text('Project Description'), },
);
$revers = $form->{revers};
no_sn_joins => [ qw(bought sold) ],
);
+ # get name of partsgroup if id is given
+ my $pg_name;
+ if ($form->{partsgroup_id}) {
+ my $pg = SL::DB::PartsGroup->new(id => $form->{partsgroup_id})->load;
+ $pg_name = $pg->{'partsgroup'};
+ }
+
# these strings get displayed at the top of the results to indicate the user which switches were used
my %optiontexts = (
active => $locale->text('Active'),
transdateto => $locale->text('To (time)') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1),
partnumber => $locale->text('Part Number') . ": '$form->{partnumber}'",
partsgroup => $locale->text('Group') . ": '$form->{partsgroup}'",
+ partsgroup_id => $locale->text('Group') . ": '$pg_name'",
serialnumber => $locale->text('Serial Number') . ": '$form->{serialnumber}'",
description => $locale->text('Part Description') . ": '$form->{description}'",
make => $locale->text('Make') . ": '$form->{make}'",
model => $locale->text('Model') . ": '$form->{model}'",
drawing => $locale->text('Drawing') . ": '$form->{drawing}'",
microfiche => $locale->text('Microfiche') . ": '$form->{microfiche}'",
- l_soldtotal => $locale->text('soldtotal'),
+ l_soldtotal => $locale->text('Qty in Selected Records'),
ean => $locale->text('EAN') . ": '$form->{ean}'",
);
my @itemstatus_keys = qw(active obsolete orphaned onhand short);
- my @callback_keys = qw(onorder ordered rfq quoted bought sold partnumber partsgroup serialnumber description make model
+ my @callback_keys = qw(onorder ordered rfq quoted bought sold partnumber partsgroup partsgroup_id serialnumber description make model
drawing microfiche l_soldtotal l_deliverydate transdatefrom transdateto ean);
# calculate dependencies
}
if ($form->{l_linetotal}) {
- $form->{l_onhand} = "Y";
+ $form->{l_qty} = "Y";
$form->{l_linetotalsellprice} = "Y" if $form->{l_sellprice};
$form->{l_linetotallastcost} = $form->{searchitems} eq 'assembly' && !$form->{bom} ? "" : 'Y' if $form->{l_lastcost};
$form->{l_linetotallistprice} = "Y" if $form->{l_listprice};
|| $form->{ordered}
|| $form->{rfq}
|| $form->{quoted}) {
- $form->{l_onhand} = "Y";
+# $form->{l_onhand} = "Y";
} else {
$form->{l_linetotalsellprice} = "";
$form->{l_linetotallastcost} = "";
}
}
+ # soldtotal doesn't make sense with more than one bsooqr option.
+ # so reset it to sold (the most common option), and issue a warning
+ my @bsooqr = qw(sold bought onorder ordered rfq quoted);
+ if ($form->{l_subtotal} && 1 < grep { $form->{$_} } @bsooqr) {
+ my $enabled = first { $form->{$_} } @bsooqr;
+ $form->{$_} = '' for @bsooqr;
+ $form->{$enabled} = 'Y';
+
+ push @options, $::locale->text('Subtotal cannot distinguish betweens record types. Only one of the selected record types will be displayed: #1', $optiontexts{$enabled});
+ }
+
IC->all_parts(\%myconfig, \%$form);
my @columns = qw(
- partnumber description partsgroup bin onhand rop unit listprice
+ partnumber description partsgroup bin onhand rop soldtotal unit listprice
linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
priceupdate weight image drawing microfiche invnumber ordnumber quonumber
- transdate name serialnumber soldtotal deliverydate ean
+ transdate name serialnumber deliverydate ean projectnumber projectdescription
);
my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
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);
+ my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys,
+ map({ "cvar_$_->{name}" } @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);
'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);
my %subtotals = map { $_ => 0 } ('onhand', @subtotal_columns);
my %totals = map { $_ => 0 } @subtotal_columns;
my $idx = 0;
- my $same_item = $form->{parts}[0]{ $form->{sort} } if (scalar @{ $form->{parts} });
+ my $same_item = @{ $form->{parts} } ? $form->{parts}[0]{ $form->{sort} } : undef;
my $defaults = AM->get_defaults();
$ref->{lastcost} *= $ref->{exchangerate} / $ref->{price_factor};
# use this for assemblies
- my $onhand = $ref->{onhand};
+ my $soldtotal = $ref->{soldtotal};
if ($ref->{assemblyitem}) {
$row->{partnumber}{align} = 'right';
- $row->{onhand}{data} = 0;
- $onhand = 0 if ($form->{sold});
+ $row->{soldtotal}{data} = 0;
+ $soldtotal = 0 if ($form->{sold});
}
my $edit_link = build_std_url('action=edit', 'id=' . E($ref->{id}), 'callback');
if (!$ref->{assemblyitem}) {
foreach my $col (@subtotal_columns) {
- $totals{$col} += $onhand * $ref->{$col};
- $subtotals{$col} += $onhand * $ref->{$col};
+ $totals{$col} += $soldtotal * $ref->{$col};
+ $subtotals{$col} += $soldtotal * $ref->{$col};
}
- $subtotals{onhand} += $onhand;
+ $subtotals{soldtotal} += $soldtotal;
}
# set module stuff
my $row = { map { $_ => { 'class' => 'listsubtotal', } } @columns };
if (($form->{searchitems} ne 'assembly') || !$form->{bom}) {
- $row->{onhand}->{data} = $form->format_amount(\%myconfig, $subtotals{onhand});
+ $row->{soldtotal}->{data} = $form->format_amount(\%myconfig, $subtotals{soldtotal});
}
map { $row->{"linetotal$_"}->{data} = $form->format_amount(\%myconfig, $subtotals{$_}, 2) } @subtotal_columns;
- map { $subtotals{$_} = 0 } ('onhand', @subtotal_columns);
+ map { $subtotals{$_} = 0 } ('soldtotal', @subtotal_columns);
$report->add_data($row);
$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{$_} = "<td> </td>" } @column_index;
- $subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom});
+ map { $column_data{$_} = "<td> </td>" } @{ $column_index };
+ $$subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom});
$column_data{onhand} =
"<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotalonhand)
+ . $form->format_amount(\%myconfig, $$subtotalonhand)
. "</th>";
$column_data{linetotalsellprice} =
"<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotalsellprice, 2)
+ . $form->format_amount(\%myconfig, $$subtotalsellprice, 2)
. "</th>";
$column_data{linetotallistprice} =
"<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotallistprice, 2)
+ . $form->format_amount(\%myconfig, $$subtotallistprice, 2)
. "</th>";
$column_data{linetotallastcost} =
"<th class=listsubtotal align=right>"
- . $form->format_amount(\%myconfig, $subtotallastcost, 2)
+ . $form->format_amount(\%myconfig, $$subtotallastcost, 2)
. "</th>";
- $subtotalonhand = 0;
- $subtotalsellprice = 0;
- $subtotallistprice = 0;
- $subtotallastcost = 0;
+ $$subtotalonhand = 0;
+ $$subtotalsellprice = 0;
+ $$subtotallistprice = 0;
+ $$subtotallastcost = 0;
print "<tr class=listsubtotal>";
- map { print "\n$column_data{$_}" } @column_index;
+ map { print "\n$column_data{$_}" } @{ $column_index };
print qq|
</tr>
$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;
$auth->assert('part_service_assembly_edit');
- $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);
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 });
my (@column_index);
my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href);
- our ($deliverydate); # ToDO: check if this indeed comes from global context
-
@column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
if ($form->{previousform}) {
map { delete $form->{$_} } qw(action header);
# 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->{$_}) : $form->{$_}
- } grep { ref $form->{$_} eq '' && $form->{$_} } grep { !/^select/ } sort keys %$form ));
+ my %form_to_save = map { ($_ => m/^ (?: listprice | sellprice | lastcost ) $/x ? $form->format_amount(\%myconfig, $form->{$_}) : $form->{$_}) }
+ keys %{ $form };
+ $previousform = $::auth->save_form_in_session(form => \%form_to_save);
$form->{callback} = $callback;
$form->{assemblytotal} = 0;
$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';
# parse pricegroups. and no, don't rely on check_form for this...
map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows};
+ # same for lastcosts
+ map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"};
+
if ($form->{item} eq "assembly") {
my $i = $form->{assembly_rows};
if ($rows > 1) {
$form->{makemodel_rows}--;
- &select_item;
- exit;
+ select_item(mode => 'IC');
+ ::end_of_request();
} else {
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g }
qw(partnumber description unit partsgroup);
$auth->assert('part_service_assembly_edit');
- my ($parts_id, %newform, $previousform, $amount, $callback);
+ my ($parts_id, %newform, $amount, $callback);
# check if there is a part number - commented out, cause there is an automatic allocation of numbers
# $form->isblank("partnumber", $locale->text(ucfirst $form->{item}." Part Number missing!"));
if(!exists $form->{addition}) {
$form->{snumbers} = qq|partnumber_| . $form->{partnumber};
$form->{addition} = "SAVED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
$parts_id = $form->{id};
# save the new form variables before splitting previousform
map { $newform{$_} = $form->{$_} } keys %$form;
- $previousform = $form->unescape($form->{previousform});
-
# 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;
- $value =~ s/%26/&/g;
- $form->{$key} = $value;
- }
+ # restore original values
+ $::auth->restore_form_from_session($newform{previousform}, form => $form);
$form->{taxaccounts} = $newform{taxaccount2};
if ($form->{item} eq 'assembly') {
qw(weight listprice sellprice rop);
$form->{assembly_rows}--;
- $i = $newform{rowcount};
+ $i = $form->{assembly_rows};
$form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
$form->{sellprice} -= $form->{"sellprice_$i"} * $form->{"qty_$i"};
$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;
if(!exists $form->{addition}) {
$form->{snumbers} = qq|partnumber_| . $form->{partnumber};
$form->{addition} = "SAVED AS NEW";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
$form->{id} = 0;
if(!exists $form->{addition}) {
$form->{snumbers} = qq|partnumber_| . $form->{partnumber};
$form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
my $rc = IC->delete(\%myconfig, \%$form);
$auth->assert('part_service_assembly_edit');
- our ($onload, $callback);
-
my $languages = IC->retrieve_languages(\%myconfig, $form);
if ($form->{language_values} ne "") {
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();
}
$main::lxdebug->leave_sub();
}
+sub back_to_record {
+ _check_io_auth();
+
+
+ delete @{$::form}{qw(action action_add action_back_to_record back_sub description item notes partnumber sellprice taxaccount2 unit vc)};
+
+ $::auth->restore_form_from_session($::form->{previousform}, clobber => 1);
+ $::form->{rowcount}--;
+ $::form->{action} = 'display_form';
+ $::form->{callback} = $::form->{script} . '?' . join('&', map { $::form->escape($_) . '=' . $::form->escape($::form->{$_}) } sort keys %{ $::form });
+ $::form->redirect;
+}
+
sub continue { call_sub($form->{"nextsub"}); }
+
+sub dispatcher {
+ my $action = first { $::form->{"action_${_}"} } qw(add back_to_record);
+ $::form->error($::locale->text('No action defined.')) unless $action;
+
+ $::form->{dispatched_action} = $action;
+ call_sub($action);
+}
projects / kivitendo-erp.git / blobdiff