X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=b5588be3b3952abde07dd264dac584f9780a112e;hb=1e0d413084100ccd892e8c5be95703be5d965de7;hp=6bd04483f6acbe06f8a1fa95139006c2eaa5ba2a;hpb=8d316ac574fb30ec29c715332b07504267ac6dd3;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 6bd04483f..b5588be3b 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -30,21 +30,23 @@
# Inventory Control module
#
#======================================================================
-#$locale->text('ea');
use POSIX qw(strftime);
use List::Util qw(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";
@@ -60,6 +62,14 @@ require "bin/mozilla/reportgenerator.pl";
# type=submit $locale->text('Edit Part')
# type=submit $locale->text('Edit Service')
# type=submit $locale->text('Edit Assembly')
+# $locale->text('Parts')
+# $locale->text('Services')
+# $locale->text('Inventory quantity must be zero before you can set this part obsolete!')
+# $locale->text('Inventory quantity must be zero before you can set this assembly obsolete!')
+# $locale->text('Part Number missing!')
+# $locale->text('Service Number missing!')
+# $locale->text('Assembly Number missing!')
+# $locale->text('ea');
# end of main
@@ -68,13 +78,10 @@ sub add {
$auth->assert('part_service_assembly_edit');
- $form->{title} = $locale->text('Add ' . ucfirst $form->{item});
-
- $form->{callback} =
- "$form->{script}?action=add&item=$form->{item}"
- unless $form->{callback};
-
- $form->{"unit_changeable"} = 1;
+ 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;
IC->get_pricegroups(\%myconfig, \%$form);
&link_part;
@@ -88,32 +95,28 @@ sub search {
$auth->assert('part_service_assembly_edit');
- # switch for backward sorting
- $form->{revers} = 0;
-
- # memory for which table was sort at last time
- $form->{lastsort} = "";
+ $form->{revers} = 0; # switch for backward sorting
+ $form->{lastsort} = ""; # memory for which table was sort at last time
+ $form->{ndxs_counter} = 0; # counter for added entries to top100
- # counter for added entries to top100
- $form->{ndxs_counter} = 0;
-
- # $locale->text('Parts')
- # $locale->text('Services')
-
- my $is_service = $form->{searchitems} eq 'service';
- my $is_assembly = $form->{searchitems} eq 'assembly';
+ my %is_xyz = map { +"is_$_" => ($form->{searchitems} eq $_) } qw(part service assembly);
$form->{title} = (ucfirst $form->{searchitems}) . "s";
$form->{title} = $locale->text($form->{title});
- $form->{title} = $locale->text('Assemblies') if $is_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;
- print $form->parse_html_template('ic/search', { is_assembly => $is_assembly,
- is_service => $is_service,
- dateformat => $myconfig{dateformat}, });
+ print $form->parse_html_template('ic/search', { %is_xyz,
+ dateformat => $myconfig{dateformat}, });
$lxdebug->leave_sub();
} #end search()
@@ -125,6 +128,8 @@ sub search_update_prices {
my $pricegroups = IC->get_pricegroups(\%myconfig, \%$form);
+ $form->{title} = $locale->text('Update Prices');
+
$form->header;
print $form->parse_html_template('ic/search_update_prices', { PRICE_ROWS => $pricegroups });
@@ -137,12 +142,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();
}
@@ -152,8 +187,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!'));
}
@@ -161,199 +198,199 @@ sub update_prices {
$lxdebug->leave_sub();
}
-sub choice {
- $lxdebug->enter_sub();
-
- $auth->assert('part_service_assembly_edit');
-
- our ($j, $lastndx);
- my ($totop100);
-
- $form->{title} = $locale->text('Top 100 hinzufuegen');
-
- $form->header;
-
- push @custom_hiddens, qw(searchitems title bom titel revers lastsort sort ndxs_counter extras);
- push @custom_hiddens, qw(itemstatus l_linetotal l_partnumber l_description l_onhand l_unit l_sellprice l_linetotalsellprice);
- my @HIDDENS = (
- +{ name => 'row', value => $j },
- +{ name => 'nextsub', value => 'item_selected' },
- +{ name => 'test', value => 'item_selected' },
- +{ name => 'lastndx', value => $lastndx },
- map(+{ name => $_, value => $form->{$_} }, @custom_hiddens),
- );
-
- my ($partnumber, $description, $unit, $sellprice, $soldtotal);
- # if choice set data
-# if ($form->{ndx}) {
-# for my $i (0 .. $form->{ndxs_counter}) {
+#sub choice {
+# $lxdebug->enter_sub();
#
-# # insert data into top100
-# push @{ $form->{parts} },
-# { number => "",
-# partnumber => $form->{"totop100_partnumber_$j"},
-# description => $form->{"totop100_description_$j"},
-# unit => $form->{"totop100_unit_$j"},
-# sellprice => $form->{"totop100_sellprice_$j"},
-# soldtotal => $form->{"totop100_soldtotal_$j"},
-# };
-# } #rof
-# } #fi
-
- $totop100 = "";
-
- # set data for next page
- for my $i (1 .. $form->{ndxs_counter}) {
- $partnumber = $form->{"totop100_partnumber_$i"};
- $description = $form->{"totop100_description_$i"};
- $unit = $form->{"totop100_unit_$i"};
- $sellprice = $form->{"totop100_sellprice_$i"};
- $soldtotal = $form->{"totop100_soldtotal_$i"};
-
- push @PARTS, {
- totop100_partnumber => $form->{"totop100_partnumber_$i"},
- totop100_description => $form->{"totop100_description_$i"},
- totop100_unit => $form->{"totop100_unit_$i"},
- totop100_sellprice => $form->{"totop100_sellprice_$i"},
- totop100_soldtotal => $form->{"totop100_soldtotal_$i"},
- }
+# $auth->assert('part_service_assembly_edit');
+#
+# our ($j, $lastndx);
+# my ($totop100);
+#
+# $form->{title} = $locale->text('Top 100 hinzufuegen');
+#
+# $form->header;
+#
+# push @custom_hiddens, qw(searchitems title bom titel revers lastsort sort ndxs_counter extras);
+# push @custom_hiddens, qw(itemstatus l_linetotal l_partnumber l_description l_onhand l_unit l_sellprice l_linetotalsellprice);
+# my @HIDDENS = (
+# +{ name => 'row', value => $j },
+# +{ name => 'nextsub', value => 'item_selected' },
+# +{ name => 'test', value => 'item_selected' },
+# +{ name => 'lastndx', value => $lastndx },
+# map(+{ name => $_, value => $form->{$_} }, @custom_hiddens),
+# );
+#
+# my ($partnumber, $description, $unit, $sellprice, $soldtotal);
+# # if choice set data
+## if ($form->{ndx}) {
+## for my $i (0 .. $form->{ndxs_counter}) {
+##
+## # insert data into top100
+## push @{ $form->{parts} },
+## { number => "",
+## partnumber => $form->{"totop100_partnumber_$j"},
+## description => $form->{"totop100_description_$j"},
+## unit => $form->{"totop100_unit_$j"},
+## sellprice => $form->{"totop100_sellprice_$j"},
+## soldtotal => $form->{"totop100_soldtotal_$j"},
+## };
+## } #rof
+## } #fi
+#
+# $totop100 = "";
+#
+# # set data for next page
+# for my $i (1 .. $form->{ndxs_counter}) {
+# $partnumber = $form->{"totop100_partnumber_$i"};
+# $description = $form->{"totop100_description_$i"};
+# $unit = $form->{"totop100_unit_$i"};
+# $sellprice = $form->{"totop100_sellprice_$i"};
+# $soldtotal = $form->{"totop100_soldtotal_$i"};
+#
+# push @PARTS, {
+# totop100_partnumber => $form->{"totop100_partnumber_$i"},
+# totop100_description => $form->{"totop100_description_$i"},
+# totop100_unit => $form->{"totop100_unit_$i"},
+# totop100_sellprice => $form->{"totop100_sellprice_$i"},
+# totop100_soldtotal => $form->{"totop100_soldtotal_$i"},
+# }
+#
+## $totop100 .= qq|
+##{"totop100_partnumber_$i"}>
+##{"totop100_description_$i"}>
+##{"totop100_unit_$i"}>
+##{"totop100_sellprice_$i"}>
+##{"totop100_soldtotal_$i"}>
+## |;
+# } #rof
+#
+# print $form->parse_html_template('ic/choice', +{ HIDDENS => \@HIDDENS, PARTS => \@PARTS });
+#
+# $lxdebug->leave_sub();
+#} #end choice
-# $totop100 .= qq|
+#sub list {
+# $lxdebug->enter_sub();
+#
+# $auth->assert('part_service_assembly_edit');
+#
+# our ($lastndx);
+# our ($partnumber, $description, $unit, $sellprice, $soldtotal);
+#
+# my @sortorders = ("", "partnumber", "description", "all");
+# my $sortorder = $sortorders[($form->{description} ? 2 : 0) + ($form->{partnumber} ? 1 : 0)];
+# IC->get_parts(\%myconfig, \%$form, $sortorder);
+#
+# $form->{title} = $locale->text('Top 100 hinzufuegen');
+#
+# $form->header;
+#
+# print qq|
+#