use List::MoreUtils qw(any);
use SL::AM;
+use SL::CVar;
use SL::IC;
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";
$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->{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,
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 });
$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');
# <th class=listtop colspan=6>| . $locale->text('choice part') . qq|</th>
# </tr>
# <tr height="5"></tr>
-# <tr class=listheading>
-# <th> </th>
-# <th class=listheading>| . $locale->text('Part Number') . qq|</th>
-# <th class=listheading>| . $locale->text('Part Description') . qq|</th>
-# <th class=listheading>| . $locale->text('Unit of measure') . qq|</th>
-# <th class=listheading>| . $locale->text('Sell Price') . qq|</th>
-# <th class=listheading>| . $locale->text('soldtotal') . qq|</th>
-# </tr>|;
+# <tr class=listheading>
+# <th> </th>
+# <th class=listheading>| . $locale->text('Part Number') . qq|</th>
+# <th class=listheading>| . $locale->text('Part Description') . qq|</th>
+# <th class=listheading>| . $locale->text('Unit of measure') . qq|</th>
+# <th class=listheading>| . $locale->text('Sell Price') . qq|</th>
+# <th class=listheading>| . $locale->text('soldtotal') . qq|</th>
+# </tr>|;
#
# my $j = 0;
# my $i = $form->{rows};
# <tr class=listrow| . ($j % 2) . qq|>|;
# if ($j == 1) {
# print qq|
-# <td><input name=ndx class=radio type=radio value=$j checked></td>|;
+# <td><input name=ndx class=radio type=radio value=$j checked></td>|;
# } else {
# print qq|
-# <td><input name=ndx class=radio type=radio value=$j></td>|;
+# <td><input name=ndx class=radio type=radio value=$j></td>|;
# }
# print qq|
-# <td><input name="new_partnumber_$j" type=hidden value="$form->{"partnumber_$j"}">$form->{"partnumber_$j"}</td>
-# <td><input name="new_description_$j" type=hidden value="$form->{"description_$j"}">$form->{"description_$j"}</td>
-# <td><input name="new_unit_$j" type=hidden value="$form->{"unit_$j"}">$form->{"unit_$j"}</td>
-# <td><input name="new_sellprice_$j" type=hidden value="$form->{"sellprice_$j"}">$form->{"sellprice_$j"}</td>
-# <td><input name="new_soldtotal_$j" type=hidden value="$form->{"soldtotal_$j"}">$form->{"soldtotal_$j"}</td>
+# <td><input name="new_partnumber_$j" type=hidden value="$form->{"partnumber_$j"}">$form->{"partnumber_$j"}</td>
+# <td><input name="new_description_$j" type=hidden value="$form->{"description_$j"}">$form->{"description_$j"}</td>
+# <td><input name="new_unit_$j" type=hidden value="$form->{"unit_$j"}">$form->{"unit_$j"}</td>
+# <td><input name="new_sellprice_$j" type=hidden value="$form->{"sellprice_$j"}">$form->{"sellprice_$j"}</td>
+# <td><input name="new_soldtotal_$j" type=hidden value="$form->{"soldtotal_$j"}">$form->{"soldtotal_$j"}</td>
# </tr>
#
-# <input name="new_id_$j" type=hidden value="$form->{"id_$j"}">|;
+# <input name="new_id_$j" type=hidden value="$form->{"id_$j"}">|;
# }
#
# print qq|
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"}) {
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};
+ my %column_defs = (
+ 'bin' => { 'text' => $locale->text('Bin'), },
+ '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'), },
+ '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
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);
}
# 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};
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};
}
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 %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'), },
+ 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
);
- map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
+ 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;
+
+ %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, 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);
$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});
+
+ 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;
# 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});
$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} = $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);
# 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}, 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},
# ALL_UNITS => $form->{ALL_UNITS},
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 });
sub assembly_row {
$lxdebug->enter_sub();
my ($numrows) = @_;
- my (@column_index, %column_data, %column_header);
- my ($nochange, $callback, $previousform, $linetotal, $href);
-
- our ($deliverydate); # ToDO: cjeck if this indeed comes from global context
+ my (@column_index);
+ my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href);
- @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;
# 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;
+ 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;
$form->{assembly_purchase_price_total} = 0;
$form->{weight} = 0;
-
}
- $column_header{runningnumber} =
- qq|<th nowrap width=5%>| . $locale->text('No.') . qq|</th>|;
- $column_header{qty} =
- qq|<th align=left nowrap width=10%>| . $locale->text('Qty') . qq|</th>|;
- $column_header{unit} =
- qq|<th align=left nowrap width=5%>| . $locale->text('Unit') . qq|</th>|;
- $column_header{partnumber} =
- qq|<th align=left nowrap width=20%>|
- . $locale->text('Part Number')
- . qq|</th>|;
- $column_header{description} =
- qq|<th nowrap width=50%>| . $locale->text('Part Description') . qq|</th>|;
- $column_header{lastcost} =
- qq|<th nowrap width=50%>| . $locale->text('Purchase Price') . qq|</th>|;
- $column_header{total} =
- qq|<th align=right nowrap>| . $locale->text('Extended') . qq|</th>|;
- $column_header{bom} = qq|<th>| . $locale->text('BOM') . qq|</th>|;
- $column_header{partsgroup} = qq|<th>| . $locale->text('Group') . qq|</th>|;
-
- print qq|
- <tr class=listheading>
- <th class=listheading>| . $locale->text('Individual Items') . qq|</th>
- </tr>
- <tr>
- <td>
- <table width=100%>
- <tr>
-|;
- map { print "\n$column_header{$_}" } @column_index;
+ my %header = (
+ runningnumber => { text => $locale->text('No.'), nowrap => 1, width => '5%' },
+ qty => { text => $locale->text('Qty'), nowrap => 1, width => '10%' },
+ unit => { text => $locale->text('Unit'), nowrap => 1, width => '5%' },
+ partnumber => { text => $locale->text('Part Number'), nowrap => 1, width => '20%' },
+ description => { text => $locale->text('Part Description'), nowrap => 1, width => '50%' },
+ lastcost => { text => $locale->text('Purchase Prices'), nowrap => 1, width => '50%' },
+ total => { text => $locale->text('Sale Prices'), nowrap => 1, },
+ bom => { text => $locale->text('BOM'), },
+ partsgroup => { text => $locale->text('Group'), },
+ );
- print qq|
- </tr>
-|;
+ my @ROWS;
for my $i (1 .. $numrows) {
+ my (%row, @row_hiddens);
+
$form->{"partnumber_$i"} =~ s/\"/"/g;
- $linetotal =
- $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 2);
- $line_purchase_price =
- $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 2); #lastcost == purchase_price | ungenaue datenbankfeld-übersetzung
- $form->{assemblytotal} += $linetotal;
+ $linetotal = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 4);
+ $line_purchase_price = $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 4);
+ $form->{assemblytotal} += $linetotal;
$form->{assembly_purchase_price_total} += $line_purchase_price;
-
- $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
-
- $linetotal = $form->format_amount(\%myconfig, $linetotal, 2);
+ $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+ $linetotal = $form->format_amount(\%myconfig, $linetotal, 2);
$line_purchase_price = $form->format_amount(\%myconfig, $line_purchase_price, 2);
+ $href = qq|$form->{script}?action=edit&id=$form->{"id_$i"}&rowcount=$i&previousform=$previousform|;
+ map { $row{$_}{data} = "" } qw(qty unit partnumber description bom partsgroup runningnumber);
+ # last row
if (($i >= 1) && ($i == $numrows)) {
-
- if ($nochange) {
- map { $column_data{$_} = qq|<td></td>| }
- qw(qty unit partnumber description bom partsgroup);
- } else {
-
- map { $column_data{$_} = qq|<td></td>| } qw(runningnumber unit bom);
-
- $column_data{qty} =
- qq|<td><input name="qty_$i" size=5 value="$form->{"qty_$i"}"></td>|;
- $column_data{partnumber} =
- qq|<td><input name="partnumber_$i" size=15 value="$form->{"partnumber_$i"}"></td>|;
- $column_data{description} =
- qq|<td><input name="description_$i" size=40 value="$form->{"description_$i"}"></td>|;
- $column_data{partsgroup} =
- qq|<td><input name="partsgroup_$i" size=10 value="$form->{"partsgroup_$i"}"></td>|;
-
+ if (!$form->{previousform}) {
+ $row{partnumber}{data} = qq|<input name="partnumber_$i" size=15 value="$form->{"partnumber_$i"}">|;
+ $row{qty}{data} = qq|<input name="qty_$i" size=5 value="$form->{"qty_$i"}">|;
+ $row{description}{data} = qq|<input name="description_$i" size=40 value="$form->{"description_$i"}">|;
+ $row{partsgroup}{data} = qq|<input name="partsgroup_$i" size=10 value="$form->{"partsgroup_$i"}">|;
}
-
+ # other rows
} else {
-
if ($form->{previousform}) {
- $column_data{partnumber} =
- qq|<td><input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}">$form->{"partnumber_$i"}</td>|;
- $column_data{qty} =
- qq|<td align=right><input type=hidden name="qty_$i" value="$form->{"qty_$i"}">$form->{"qty_$i"}</td>|;
-
- $column_data{bom} =
- qq|<td align=center><input type=hidden name="bom_$i" value=$form->{"bom_$i"}>|;
- $column_data{bom} .= ($form->{"bom_$i"}) ? "x" : " ";
- $column_data{bom} .= qq|</td>|;
-
- $column_data{partsgroup} =
- qq|<td><input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">$form->{"partsgroup_$i"}</td>|;
-
+ 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|<td><input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}"><a href=$href>$form->{"partnumber_$i"}</a></td>|;
- $column_data{runningnumber} =
- qq|<td><input name="runningnumber_$i" size=3 value="$i"></td>|;
- $column_data{qty} =
- qq|<td><input name="qty_$i" size=5 value="$form->{"qty_$i"}"></td>|;
-
- $form->{"bom_$i"} = ($form->{"bom_$i"}) ? "checked" : "";
- $column_data{bom} =
- qq|<td align=center><input name="bom_$i" type=checkbox class=checkbox value=1 $form->{"bom_$i"}></td>|;
-
- $column_data{partsgroup} =
- qq|<td><input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">$form->{"partsgroup_$i"}</td>|;
+ $row{partnumber}{data} = qq|<a href=$href>$form->{"partnumber_$i"}</a>|;
+ $row{qty}{data} = qq|<input name="qty_$i" size=5 value="$form->{"qty_$i"}">|;
+ $row{runningnumber}{data} = qq|<input name="runningnumber_$i" size=3 value="$i">|;
+ $row{bom}{data} = sprintf qq|<input name="bom_$i" type=checkbox class=checkbox value=1 %s>|,
+ $form->{"bom_$i"} ? 'checked' : '';
}
-
- $column_data{unit} =
- qq|<td><input type=hidden name="unit_$i" value="$form->{"unit_$i"}">$form->{"unit_$i"}</td>|;
- $column_data{description} =
- qq|<td><input type=hidden name="description_$i" value="$form->{"description_$i"}">$form->{"description_$i"}</td>|;
+ 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|<td align=right>$line_purchase_price</td>|;
- $column_data{total} = qq|<td align=right>$linetotal</td>|;
-
- $column_data{deliverydate} = qq|<td align=right>$deliverydate</td>|;
-
- print qq|
- <tr>|;
+ $row{lastcost}{data} = $line_purchase_price;
+ $row{total}{data} = $linetotal;
+ $row{lastcost}{align} = 'right';
+ $row{total}{align} = 'right';
+ $row{deliverydate}{align} = 'right';
- map { print "\n$column_data{$_}" } @column_index;
+ push @row_hiddens, qw(id sellprice lastcost weight price_factor_id price_factor);
+ $row{hiddens} = [ map +{ name => "${_}_$i", value => $form->{"${_}_$i"} }, @row_hiddens ];
- print qq|
- </tr>
- <input type=hidden name="id_$i" value=$form->{"id_$i"}>
- <input type=hidden name="sellprice_$i" value=$form->{"sellprice_$i"}>
- <input type=hidden name="lastcost_$i" value=$form->{"lastcost_$i"}>
- <input type=hidden name="weight_$i" value=$form->{"weight_$i"}>
- <input type=hidden name="price_factor_id_$i" value=$form->{"price_factor_id_$i"}>
- <input type=hidden name="price_factor_$i" value=$form->{"price_factor_$i"}>
-|;
+ push @ROWS, \%row;
}
- print qq|
- </table>
- </td>
- </tr>
-|;
+ print $form->parse_html_template('ic/assembly_row', { COLUMNS => \@column_index, ROWS => \@ROWS, HEADER => \%header });
$lxdebug->leave_sub();
}
# 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!"));
# 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.") . " " .
# 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};
# 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;
- # 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;
- }
+ my $ic_cvar_configs = CVar->get_configs(module => 'IC');
+ my @ic_cvar_fields = map { "cvar_$_->{name}" } @{ $ic_cvar_configs };
+
+ # restore original values
+ $::auth->restore_form_from_session($newform{previousform}, form => $form);
$form->{taxaccounts} = $newform{taxaccount2};
if ($form->{item} eq 'assembly') {
# 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;
- $form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"};
+ # das ist __voll__ bekloppt, dass so auszurechnen jb 22.5.09
+ #$form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"};
$form->{weight} += $form->{"weight_$i"} * $form->{"qty_$i"};
} else {
$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};
$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;
# 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;
# 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);
$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 }) {
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"}); }
projects / kivitendo-erp.git / blobdiff