X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fic.pl;h=4eb1e41e108a32d790f6b8ba6d94624b2c81f2b0;hb=27ffa16a85221662dee49da0f210312383341240;hp=93758ec8f15d4c5779ea4e041c42ef5cb8912639;hpb=602a4d98939e03b3533f5b6de426ee7f719cf2e1;p=kivitendo-erp.git
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 93758ec8f..4eb1e41e1 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -33,17 +33,20 @@
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";
@@ -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,10 +103,16 @@ 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;
print $form->parse_html_template('ic/search', { %is_xyz,
@@ -118,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 });
@@ -130,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();
}
@@ -145,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!'));
}
@@ -249,14 +293,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 +311,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 +618,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 +792,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 +915,7 @@ sub addtop100 {
}
if ($form->{l_subtotal} eq 'Y') {
- &parts_subtotal;
+ parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice);
} #fi
if ($form->{"l_linetotal"}) {
@@ -969,7 +1010,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 {
@@ -979,12 +1020,43 @@ 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'), },
+ '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'), },
+ 'transdate' => { 'text' => $locale->text('Transdate'), },
+ 'unit' => { 'text' => $locale->text('Unit'), },
+ 'weight' => { 'text' => $locale->text('Weight'), },
+ );
+
+ $revers = $form->{revers};
+ $lastsort = $form->{lastsort};
# sorting and direction of sorting
# ToDO: change this to the simpler field+direction method
@@ -1002,10 +1074,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.
@@ -1054,6 +1126,7 @@ sub generate_report {
drawing => $locale->text('Drawing') . ": '$form->{drawing}'",
microfiche => $locale->text('Microfiche') . ": '$form->{microfiche}'",
l_soldtotal => $locale->text('soldtotal'),
+ ean => $locale->text('EAN') . ": '$form->{ean}'",
);
my @itemstatus_keys = qw(active obsolete orphaned onhand short);
@@ -1068,13 +1141,18 @@ 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};
}
# 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};
@@ -1084,12 +1162,7 @@ sub generate_report {
if ($form->{l_linetotal}) {
$form->{l_onhand} = "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};
}
@@ -1114,46 +1187,26 @@ sub generate_report {
}
}
- $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
IC->all_parts(\%myconfig, \%$form);
- 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);
-
- 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 unit listprice
+ linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
+ priceupdate weight image drawing microfiche invnumber ordnumber quonumber
+ transdate name serialnumber soldtotal deliverydate ean
);
- 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, @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 +1235,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,12 +1244,27 @@ 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 $defaults = AM->get_defaults();
+
# postprocess parts
foreach my $ref (@{ $form->{parts} }) {
@@ -1228,6 +1297,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 +1310,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->{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});
@@ -1295,42 +1366,41 @@ sub generate_report {
sub parts_subtotal {
$lxdebug->enter_sub();
-
+
$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 +1421,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,16 +1526,18 @@ sub form_header {
$auth->assert('part_service_assembly_edit');
- $form->{eur} = $eur; # config dumps into namespace - yuck
+ $form->{eur} = $::lx_office_conf{system}->{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);
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} };
@@ -1472,17 +1545,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();
}
@@ -1491,102 +1572,7 @@ sub form_footer {
$auth->assert('part_service_assembly_edit');
- if ($form->{item} eq "assembly") {
-
- print qq|
-
-
-
-
- | . $locale->text('Total') . qq| |
- | . $form->format_amount(\%myconfig, $form->{assemblytotal}, 2) . qq| |
-
-
- |
-
- {assembly_rows}>
-|;
- }
-
- print qq|
-
-
-
- {vc}>
-
-
|
-
-
-
-
-
- |;
-
-####### moved into makemodel_row #############
-# unless ($form->{item} eq "service") {
-# print qq|
-# {makemodel_rows}>
-# |;
-# }
-
- print qq|
- {price_rows}>|;
-
- print qq|
- |;
-
- if ($form->{id}) {
-
- if (!$form->{previousform}) {
- print qq|
- |;
- }
-
- if ($form->{orphaned}) {
- if (!$form->{previousform}) {
- if ($form->{item} eq 'assembly') {
- if (!$form->{onhand}) {
- print qq|
- |;
- }
- } else {
- print qq|
- |;
- }
- }
- }
- }
-
- if (!$form->{previousform}) {
- if ($form->{menubar}) {
- require "bin/mozilla/menu.pl";
- &menubar;
- }
- }
-# button for saving history
- if($form->{id} ne "") {
- print qq|
- {id}
- . qq|); name=history id=history value=|
- . $locale->text('history')
- . qq|>|;
- }
-# /button for saving history
- print qq|
-
-
-
-
-
-