X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=5b377b6391dfa576eee087295c3c051dfec5a1a8;hb=b29783a3f0cff568b5d344d4fd34fe65840bea46;hp=3383316ace35b6504d51637818a490ab4a4d27fa;hpb=4f82ce002979fbe9a59d5e69a53e3697b7df20c1;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 3383316ac..5b377b639 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -34,6 +34,7 @@
use POSIX qw(strftime);
use List::Util qw(max);
+use SL::AM;
use SL::IC;
use SL::ReportGenerator;
@@ -99,7 +100,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;
@@ -134,7 +135,7 @@ sub confirm_price_update {
$form->header;
map { delete $form->{$_} } qw(action header);
-
+
print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ] });
$lxdebug->leave_sub();
@@ -574,9 +575,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;
@@ -969,7 +967,7 @@ sub addtop100 {
# l_linetotal l_priceupdate l_bin l_rop l_weight l_image l_drawing l_microfiche
# l_partsgroup l_subtotal l_soldtotal l_deliverydate
#
-# hiddens:
+# hiddens:
# nextsub revers lastsort sort ndxs_counter
#
sub generate_report {
@@ -1002,10 +1000,10 @@ sub generate_report {
} #fi
# special case if we have a serialnumber limit search
- # serialnumbers are only given in invoices and orders,
+ # serialnumbers are only given in invoices and orders,
# so they can only pop up in bought, sold, rfq, and quoted stuff
- $form->{no_sn_joins} = 'Y' if ( !$form->{bought} && !$form->{sold}
- && !$form->{rfq} && !$form->{quoted}
+ $form->{no_sn_joins} = 'Y' if ( !$form->{bought} && !$form->{sold}
+ && !$form->{rfq} && !$form->{quoted}
&& ($form->{l_serialnumber} || $form->{serialnumber}));
# special case for any checkbox of bought | sold | onorder | ordered | rfq | quoted.
@@ -1068,7 +1066,7 @@ sub generate_report {
# generate callback and optionstrings
my @options;
- for my $key (@itemstatus_keys, @callback_keys) {
+ for my $key (@itemstatus_keys, @callback_keys) {
next if ($form->{itemstatus} ne $key && !$form->{$key});
push @options, $optiontexts{$key};
}
@@ -1114,8 +1112,6 @@ sub generate_report {
}
}
- $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
IC->all_parts(\%myconfig, \%$form);
my @columns =
@@ -1196,6 +1192,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 +1226,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};
@@ -1239,7 +1239,7 @@ sub generate_report {
# 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->{customer_id} ne '' ? 'sales_order' : 'purchase_order'), 'id=' . E($ref->{trans_id}), 'callback');
$row->{ordnumber}{link} = $edit_oe_link;
$row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});
@@ -1295,7 +1295,7 @@ sub generate_report {
sub parts_subtotal {
$lxdebug->enter_sub();
-
+
$auth->assert('part_service_assembly_edit');
# imports
@@ -1462,9 +1462,11 @@ sub form_header {
map { $form->{"is_$_"} = ($form->{item} eq $_) } qw(part service assembly);
map { $form->{$_} =~ s/"/"/g; } qw(unit);
-
- $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS',
- 'partsgroup' => 'all_partsgroup');
+
+ $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS',
+ '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 +1477,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();
}
@@ -1499,8 +1504,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;
+ 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();
@@ -1515,7 +1521,7 @@ sub assembly_row {
our ($deliverydate); # ToDO: cjeck if this indeed comes from global context
@column_index =
- qw(runningnumber qty unit bom partnumber description partsgroup total);
+ qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
if ($form->{previousform}) {
$nochange = 1;
@@ -1534,6 +1540,8 @@ 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;
@@ -1544,6 +1552,7 @@ sub assembly_row {
$form->{callback} = $callback;
$form->{assemblytotal} = 0;
+ $form->{assembly_purchase_price_total} = 0;
$form->{weight} = 0;
}
@@ -1559,6 +1568,8 @@ sub assembly_row {
. qq||;
$column_header{description} =
qq|| . $locale->text('Part Description') . qq| |;
+ $column_header{lastcost} =
+ qq|| . $locale->text('Purchase Price') . qq| |;
$column_header{total} =
qq|| . $locale->text('Extended') . qq| |;
$column_header{bom} = qq|| . $locale->text('BOM') . qq| |;
@@ -1584,12 +1595,16 @@ sub assembly_row {
$form->{"partnumber_$i"} =~ s/\"/"/g;
$linetotal =
- $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+ $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;
+ $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);
if (($i >= 1) && ($i == $numrows)) {
@@ -1651,6 +1666,7 @@ sub assembly_row {
qq|$line_purchase_price |;
$column_data{total} = qq|$linetotal |;
$column_data{deliverydate} = qq|$deliverydate |;
@@ -1665,6 +1681,8 @@ sub assembly_row {