X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=fad711ce8ed26a0c9ee469bd2332c5578b1a463e;hb=c184bce36ecd18049541dccaaa38d212fb6170cf;hp=3a34b2b144e275f16359b01f319dd8b6c4719b6a;hpb=7e2f7d89d77305ba071fe4f09bc158b711b00738;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 3a34b2b14..fad711ce8 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -33,7 +33,9 @@
use POSIX qw(strftime);
use List::Util qw(max);
+use List::MoreUtils qw(any);
+use SL::AM;
use SL::IC;
use SL::ReportGenerator;
@@ -130,12 +132,42 @@ sub confirm_price_update {
$auth->assert('part_service_assembly_edit');
+ my @errors = ();
+ my $value_found = false;
+
+ 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 +177,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!'));
}
@@ -1191,6 +1225,8 @@ sub generate_report {
my $idx = 0;
my $same_item = $form->{parts}[0]{ $form->{sort} } if (scalar @{ $form->{parts} });
+ my $defaults = AM->get_defaults();
+
# postprocess parts
foreach my $ref (@{ $form->{parts} }) {
@@ -1223,6 +1259,8 @@ 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};
@@ -1460,7 +1498,7 @@ sub form_header {
$form->get_lists('price_factors' => 'ALL_PRICE_FACTORS',
'partsgroup' => 'all_partsgroup',
- 'vendors' => 'ALL_VENDORS',);
+ 'vendors' => 'ALL_VENDORS',);
IC->retrieve_buchungsgruppen(\%myconfig, $form);
@@ -1472,6 +1510,8 @@ sub form_header {
$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->header;
@@ -1533,10 +1573,16 @@ sub assembly_row {
# 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;
- $previousform .= qq|$key=$form->{$key}&|;
+ 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));
@@ -1558,11 +1604,11 @@ sub assembly_row {
. $locale->text('Part Number')
. qq||;
$column_header{description} =
- qq|