X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=06397315919188a5538d157b0e8ba99a42cf5db8;hb=7011fd23ae5457ee62f14a3ff37af5a344f4041d;hp=5f16184e8a5a1fd06c43476aaf592abaf60fad2d;hpb=21e3b9697fa7e9481b79d0f16ef8cc5d0892f299;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 5f16184e8..063973159 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;
@@ -99,7 +101,7 @@ 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;
@@ -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!'));
}
@@ -574,9 +608,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;
@@ -1114,8 +1145,6 @@ sub generate_report {
}
}
- $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
IC->all_parts(\%myconfig, \%$form);
my @columns =
@@ -1196,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} }) {
@@ -1228,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};
@@ -1464,7 +1497,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} };
@@ -1475,14 +1510,17 @@ 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;
- 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();
}
@@ -1501,6 +1539,7 @@ sub makemodel_row {
my ($numrows) = @_;
my @mm_data = grep { any { $_ ne '' } @$_{qw(make model)} } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"} }, 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 +1548,12 @@ sub makemodel_row {
sub assembly_row {
$lxdebug->enter_sub();
my ($numrows) = @_;
- my (@column_index, %column_data, %column_header);
- my ($nochange, $callback, $previousform, $linetotal, $href);
+ my (@column_index);
+ my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href);
our ($deliverydate); # ToDO: cjeck if this indeed comes from global context
- @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 +1568,90 @@ 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) {
+ $previousform = $form->escape($form->escape(join '&', map {
+ sprintf "%s=%s", Q($_), /^listprice|lastcost|sellprice$/ ? $form->format_amount(\%myconfig, $form->{$key}) : $form->{$key}
+ } grep { ref $form->{$_} eq '' && $form->{$_} } grep { !/^select/ } sort keys %$form ));
- # 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|
| } - 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 | |; - - print qq| -