X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fic.pl;h=2ada087cbbe7450bde9645d1f19e28006a76feba;hb=72be9c763f3b7f7df1fae4fe10011e45f9e2ad1d;hp=2e2701c043ef896f33e2ecb88e9006e5defae4bd;hpb=273d8de617d4f05e5eaa96ec017bb7b9d98fc811;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 2e2701c04..2ada087cb 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -32,18 +32,21 @@
#======================================================================
use POSIX qw(strftime);
-use List::Util qw(max);
+use List::Util qw(first max);
+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";
@@ -75,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;
@@ -99,14 +103,22 @@ sub search {
$form->{title} = (ucfirst $form->{searchitems}) . "s";
$form->{title} = $locale->text($form->{title});
- $form->{title} = $locale->text('Assemblies') if ($is_xyz{assembly});
+ $form->{title} = $locale->text('Assemblies') if ($is_xyz{is_assembly});
$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;
+ $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()
@@ -118,6 +130,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 });
@@ -130,12 +144,42 @@ sub confirm_price_update {
$auth->assert('part_service_assembly_edit');
+ my @errors = ();
+ 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');
+ my $type = $idx =~ m/\d/ ? $form->{"pricegroup_type_${idx}"} : $form->{"${idx}_type"};
+ my $value_idx = $idx =~ m/\d/ ? "price_${idx}" : $idx;
+ my $value = $form->parse_amount(\%myconfig, $form->{$value_idx});
+
+ if ((0 > $value) && ($type eq 'percent')) {
+ push @errors, $locale->text('You cannot adjust the price for pricegroup "#1" by a negative percentage.', $name);
+
+ } elsif (!$value && ($form->{$value_idx} ne '')) {
+ push @errors, $locale->text('No valid number entered for pricegroup "#1".', $name);
+
+ } elsif (0 < $value) {
+ $value_found = 1;
+ }
+ }
+
+ push @errors, $locale->text('No prices will be updated because no prices have been entered.') if (!$value_found);
+
+ my $num_matches = IC->get_num_matches_for_priceupdate();
+
+ $form->header();
+
+ if (@errors) {
+ $form->show_generic_error(join('
', @errors), 'back_button' => 1);
+ }
+
$form->{nextsub} = "update_prices";
- $form->header;
map { delete $form->{$_} } qw(action header);
- print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ] });
+ print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ],
+ num_matches => $num_matches });
$lxdebug->leave_sub();
}
@@ -145,8 +189,10 @@ sub update_prices {
$auth->assert('part_service_assembly_edit');
- if (IC->update_prices(\%myconfig, \%$form)) {
- $form->redirect($form->{update_count} . $locale->text('prices updated!'));
+ my $num_updated = IC->update_prices(\%myconfig, \%$form);
+
+ if (-1 != $num_updated) {
+ $form->redirect($locale->text('#1 prices were updated.', $num_updated));
} else {
$form->error($locale->text('Could not update prices!'));
}
@@ -249,14 +295,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};
@@ -267,20 +313,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|
@@ -574,9 +620,6 @@ sub addtop100 {
}
}
- $form->{l_lastcost} = ""
- if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
foreach my $item (@columns) {
if ($form->{"l_$item"} eq "Y") {
push @column_index, $item;
@@ -751,7 +794,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} };
}
}
@@ -874,7 +917,7 @@ sub addtop100 {
}
if ($form->{l_subtotal} eq 'Y') {
- &parts_subtotal;
+ parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice);
} #fi
if ($form->{"l_linetotal"}) {
@@ -979,12 +1022,46 @@ 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};
+ 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('Stocked 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('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};
+ $lastsort = $form->{lastsort};
# sorting and direction of sorting
# ToDO: change this to the simpler field+direction method
@@ -1030,6 +1107,13 @@ sub generate_report {
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'),
@@ -1047,17 +1131,19 @@ sub generate_report {
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
@@ -1074,7 +1160,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};
@@ -1082,14 +1173,9 @@ sub generate_report {
}
if ($form->{l_linetotal}) {
- $form->{l_onhand} = "Y";
+ $form->{l_qty} = "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};
}
@@ -1107,53 +1193,45 @@ sub generate_report {
|| $form->{ordered}
|| $form->{rfq}
|| $form->{quoted}) {
- $form->{l_onhand} = "Y";
+# $form->{l_onhand} = "Y";
} else {
$form->{l_linetotalsellprice} = "";
$form->{l_linetotallastcost} = "";
}
}
- $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom});
+ # 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';
- IC->all_parts(\%myconfig, \%$form);
+ push @options, $::locale->text('Subtotal cannot distinguish betweens record types. Only one of the selected record types will be displayed: #1', $optiontexts{$enabled});
+ }
- 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);
+ IC->all_parts(\%myconfig, \%$form);
- 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 soldtotal unit listprice
+ linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
+ priceupdate weight image drawing microfiche invnumber ordnumber quonumber
+ transdate name serialnumber deliverydate ean projectnumber projectdescription
);
- 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);
@@ -1182,6 +1260,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);
@@ -1190,11 +1269,26 @@ 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});
+
+ 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;
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();
# postprocess parts
foreach my $ref (@{ $form->{parts} }) {
@@ -1209,12 +1303,12 @@ sub generate_report {
$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');
@@ -1228,18 +1322,20 @@ sub generate_report {
map { $row->{$_}{data} = $form->format_amount(\%myconfig, $ref->{$_}); } qw(onhand rop weight soldtotal);
+ $row->{weight}->{data} .= ' ' . $defaults->{weightunit};
+
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
if ($ref->{module} eq 'oe') {
- my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{type}), '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});
@@ -1265,11 +1361,11 @@ sub generate_report {
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);
@@ -1298,39 +1394,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|
@@ -1351,7 +1446,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;
@@ -1455,7 +1551,6 @@ sub form_header {
$auth->assert('part_service_assembly_edit');
- $form->{eur} = $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);
@@ -1464,7 +1559,9 @@ sub form_header {
map { $form->{$_} =~ s/"/"/g; } qw(unit);
$form->get_lists('price_factors' => 'ALL_PRICE_FACTORS',
- 'partsgroup' => 'all_partsgroup');
+ 'partsgroup' => 'all_partsgroup',
+ 'vendors' => 'ALL_VENDORS',);
+
IC->retrieve_buchungsgruppen(\%myconfig, $form);
@{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} };
@@ -1472,17 +1569,25 @@ 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}, 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},
- BUCHUNGSGRUPPEN => $form->{BUCHUNGSGRUPPEN},
- payment_terms => $form->{payment_terms},
- all_partsgroup => $form->{all_partsgroup}});
+ #print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS},
+ # ALL_UNITS => $form->{ALL_UNITS},
+ # BUCHUNGSGRUPPEN => $form->{BUCHUNGSGRUPPEN},
+ # payment_terms => $form->{payment_terms},
+ # all_partsgroup => $form->{all_partsgroup}});
+ print $form->parse_html_template('ic/form_header');
$lxdebug->leave_sub();
}
@@ -1499,8 +1604,9 @@ 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 });
$lxdebug->leave_sub();
@@ -1509,13 +1615,10 @@ sub makemodel_row {
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 total);
+ @column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
if ($form->{previousform}) {
$nochange = 1;
@@ -1530,149 +1633,89 @@ 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) {
+ 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);
- # escape ampersands
- $form->{$key} =~ s/&/%26/g;
- $previousform .= qq|$key=$form->{$key}&|;
- }
- chop $previousform;
- $previousform = $form->escape($form->escape($previousform, 1));
$form->{callback} = $callback;
-
$form->{assemblytotal} = 0;
+ $form->{assembly_purchase_price_total} = 0;
$form->{weight} = 0;
-
}
- $column_header{runningnumber} =
- qq|| . $locale->text('No.') . qq| | |;
- $column_header{qty} =
- qq|| . $locale->text('Qty') . qq| | |;
- $column_header{unit} =
- qq|| . $locale->text('Unit') . qq| | |;
- $column_header{partnumber} =
- qq||
- . $locale->text('Part Number')
- . qq| | |;
- $column_header{description} =
- qq|| . $locale->text('Part Description') . qq| | |;
- $column_header{total} =
- qq|| . $locale->text('Extended') . qq| | |;
- $column_header{bom} = qq|| . $locale->text('BOM') . qq| | |;
- $column_header{partsgroup} = qq|| . $locale->text('Group') . qq| | |;
-
- print qq|
-
- | . $locale->text('Individual Items') . qq| |
-
-
-
-
-
-|;
- 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|
-
-|;
+ my @ROWS;
for my $i (1 .. $numrows) {
- $form->{"partnumber_$i"} =~ s/\"/"/g;
+ my (%row, @row_hiddens);
- $linetotal =
- $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
- $form->{assemblytotal} += $linetotal;
-
- $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
-
- $linetotal = $form->format_amount(\%myconfig, $linetotal, 2);
+ $form->{"partnumber_$i"} =~ s/\"/"/g;
+ $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);
+ $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| | | }
- 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{total} = qq|$linetotal | |;
-
- $column_data{deliverydate} = qq|$deliverydate | |;
+ $row{lastcost}{data} = $line_purchase_price;
+ $row{total}{data} = $linetotal;
+ $row{lastcost}{align} = 'right';
+ $row{total}{align} = 'right';
+ $row{deliverydate}{align} = 'right';
- print qq|
- |;
-
- 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|
-
- {"id_$i"}>
- {"sellprice_$i"}>
- {"weight_$i"}>
-|;
+ push @ROWS, \%row;
}
- print qq|
-
- |
-
-|;
+ print $form->parse_html_template('ic/assembly_row', { COLUMNS => \@column_index, ROWS => \@ROWS, HEADER => \%header });
$lxdebug->leave_sub();
}
@@ -1680,6 +1723,12 @@ sub assembly_row {
sub update {
$lxdebug->enter_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};
@@ -1701,8 +1750,8 @@ sub update {
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);
@@ -1737,7 +1786,7 @@ sub save {
$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!"));
@@ -1745,13 +1794,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.") . " " .
@@ -1770,8 +1814,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};
@@ -1783,17 +1827,14 @@ sub save {
# 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') {
@@ -1811,8 +1852,10 @@ 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;
- $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 {
@@ -1822,6 +1865,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};
@@ -1849,7 +1893,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;
@@ -1897,8 +1941,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;
@@ -1918,8 +1962,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);
@@ -1954,12 +1998,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 }) {
@@ -1980,17 +2022,55 @@ 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 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);
+}