X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=c7d289f119dc4632dc9bff4fff5cb357a40be47b;hb=59d350af569acf4d081454c32bf724872aa48307;hp=3a31a2ee7c2d746a3d40430885dc5d444d1cf4c2;hpb=dc0dff70aac51adc6086a3d61e4c027174b711bc;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 3a31a2ee7..c7d289f11 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -367,65 +367,18 @@ sub form_header {
limit => $myconfig{vclimit} + 1 },
"price_factors" => "ALL_PRICE_FACTORS");
- # contacts
- @values = ("", map { $_->{cp_id} } @{ $form->{ALL_CONTACTS} });
- %labels = map { $_->{cp_id} => $_->{"cp_name"} . ($_->{cp_abteilung} ? " ($_->{cp_abteilung})" : "") } @{ $form->{ALL_CONTACTS} };
- $TMPL_VAR{contact} = NTI($cgi->popup_menu('-name' => 'cp_id', '-values' => \@values, '-style' => 'width: 250px',
- '-labels' => \%labels, '-default' => $form->{"cp_id"})) if scalar @values > 1;
+ # label subs
+ $TMPL_VAR{sales_employee_labels} = sub { $_[0]->{name} || $_[0]->{login} };
+ $TMPL_VAR{shipto_labels} = sub { join "; ", grep { $_ } map { $_[0]->{"shipto${_}" } } qw(name department_1 street city) };
+ $TMPL_VAR{contact_labels} = sub { $_[0]->{"cp_name"} . ($_[0]->{cp_abteilung} ? " ($_[0]->{cp_abteilung})" : "") };
# vendor/customer
- @values = map { "$_->{name}--$_->{id}" } @{ $form->{uc "all_$form->{vc}s" } };
- %labels = map { +"$_->{name}--$_->{id}" => $_->{name} } @{ $form->{uc "all_$form->{vc}s" } };
+ $TMPL_VAR{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" };
+ $TMPL_VAR{vclimit} = $myconfig{vclimit};
+ $TMPL_VAR{vc_select} = "customer_or_vendor_selection_window('$form->{vc}', '', @{[ $form->{vc} eq 'vendor' ? 1 : 0 ]}, 0)";
push @custom_hiddens, "$form->{vc}_id";
push @custom_hiddens, "old$form->{vc}";
push @custom_hiddens, "select$form->{vc}";
- $TMPL_VAR{vc} = sprintf qq|| %s | %s | |,
- $locale->text(ucfirst $form->{vc}),
- ($myconfig{vclimit} <= scalar(@values))
- ? $cgi->textfield(-value => H($form->{"old$form->{vc}"} =~ /^(.*)\-\-.*$/), -name => $form->{vc})
- : NTI($cgi->popup_menu('-name' => "$form->{vc}", '-default' => $form->{"old$form->{vc}"},
- '-onChange' => "document.getElementById('update_button').click();",
- '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px'));
-
- # payments (for footer)
- @values = ("", map { $_->{id} } @{ $form->{ALL_PAYMENTS} });
- %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_PAYMENTS} };
- $TMPL_VAR{payments} = NTI($cgi->popup_menu('-name' => 'payment_id', '-values' => \@values, '-style' => 'width: 250px',
- '-labels' => \%labels, '-default' => $form->{payment_id}));
-
- # shipto
- @values = ("", map { $_->{shipto_id} } @{ $form->{ALL_SHIPTO} });
- $TMPL_VAR{ALL_SHIPTO} = $form->{ALL_SHIPTO};
- for my $item ( @{ $TMPL_VAR{ALL_SHIPTO} }) {
- $item->{label} = join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city);
- }
- %labels = map { my $item=$_; $_->{shipto_id} => join "; ", grep { $_ } map { $item->{"shipto${_}" } } qw(name department_1 street city) } @{ $form->{ALL_SHIPTO} };
- $TMPL_VAR{shipto} = NTI($cgi->popup_menu('-name' => 'shipto_id', '-values' => \@values, '-style' => 'width: 250px',
- '-labels' => \%labels, '-default' => $form->{"shipto_id"})) if scalar @values > 1;
-
- # projects
- @values = ("", map { $_->{id} } @{ $form->{ALL_PROJECTS} });
- %labels = map { $_->{id} => $_->{projectnumber} } @{ $form->{ALL_PROJECTS} };
- $TMPL_VAR{globalprojectnumber} = NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
- '-labels' => \%labels, '-default' => $form->{"globalproject_id"}));
-
- # salesmen
- @values = map { $_->{id} } @{ $form->{ALL_SALESMEN} };
- %labels = map { $_->{id} => ($_->{name} || $_->{login}) } @{ $form->{ALL_SALESMEN} };
- $TMPL_VAR{salesmen} = NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{"salesman_id"} ? $form->{"salesman_id"} : $form->{"employee_id"},
- '-values' => \@values, '-labels' => \%labels)) if $form->{type} =~ /^sales_/ && scalar @values;
-
- # employees
- @values = map { $_->{id} } @{ $form->{ALL_EMPLOYEES} };
- %labels = map { $_->{id} => $_->{name} || $_->{login} } @{ $form->{ALL_EMPLOYEES} };
- $TMPL_VAR{employee} = NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
- '-values' => \@values, '-labels' => \%labels));
-
- # taxzone
- @values = map { $_->{id} } @{ $form->{ALL_TAXZONES} };
- %labels = map { $_->{id} => $_->{description} } @{ $form->{ALL_TAXZONES} };
- $TMPL_VAR{taxzone} = NTI($cgi->popup_menu('-name' => 'taxzone_id', '-default' => $form->{"taxzone_id"},
- '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px'));
# currencies and exchangerate
@values = map { $_ } @{ $form->{ALL_CURRENCIES} };
@@ -484,7 +437,7 @@ sub form_header {
is_pur_ord => scalar ($form->{type} =~ /purchase_order$/),
);
- print $form->parse_html_template2("oe/orders_header", { %TMPL_VAR });
+ print $form->parse_html_template("oe/orders_header", { %TMPL_VAR });
$lxdebug->leave_sub();
}
@@ -541,7 +494,7 @@ sub form_footer {
$form->{oldinvtotal} = $form->{invtotal};
- print $form->parse_html_template2("oe/orders_footer", {
+ print $form->parse_html_template("oe/orders_footer", {
%TMPL_VAR,
webdav => $webdav,
print_options => print_options(inline => 1),
@@ -2000,214 +1953,3 @@ sub display_form {
$lxdebug->leave_sub();
}
-sub display_row {
- $lxdebug->enter_sub();
- my $numrows = shift;
-
- # column_index
- my @header_sort = qw(runningnumber partnumber description ship qty unit sellprice_pg sellprice discount linetotal);
- my @HEADER = (
- { id => 'runningnumber', width => 5, value => $locale->text('No.'), display => 1, },
- { id => 'partnumber', width => 12, value => $locale->text('Number'), display => 1, },
- { id => 'description', width => 30, value => $locale->text('Part Description'), display => 1, },
- { id => 'ship', width => 5, value => ($form->{type} eq 'purchase_order' ? $locale->text('Ship rcvd') : $locale->text('Ship')),
- display => $form->{type} =~ /sales_order/ || ($form->{type} =~ /purchase_order/ && !($lizenzen && $form->{vc} eq "customer")) , },
- { id => 'qty', width => 5, value => $locale->text('Qty'), display => 1, },
- { id => 'unit', width => 5, value => $locale->text('Unit'), display => 1, },
- { id => 'license', width => 10, value => $locale->text('License'), display => 0, },
- { id => 'serialnr', width => 10, value => $locale->text('Serial No.'), display => 0, },
- { id => 'projectnr', width => 10, value => $locale->text('Project'), display => 0, },
- { id => 'sellprice', width => 15, value => $locale->text('Price'), display => 1, },
- { id => 'sellprice_pg', width => 15, value => $locale->text('Pricegroup'), display => $form->{type} =~ /^sales_/, },
- { id => 'discount', width => 5, value => $locale->text('Discount'), display => $form->{vc} eq 'customer', },
- { id => 'linetotal', width => 10, value => $locale->text('Extended'), display => 1, },
- { id => 'bin', width => 10, value => $locale->text('Bin'), display => 0, },
- );
- my @column_index = map { $_->{id} } grep { $_->{display} } @HEADER;
-
- # cache units
- my $dimension_units = AM->retrieve_units(\%myconfig, $form, "dimension");
- my $service_units = AM->retrieve_units(\%myconfig, $form, "service");
- my $all_units = AM->retrieve_units(\%myconfig, $form);
-
- my $colspan = scalar @column_index;
-
- $form->{invsubtotal} = 0;
- map { $form->{"${_}_base"} = 0 } (split(/ /, $form->{taxaccounts}));
-
- # about details
- $myconfig{show_form_details} = 1 unless (defined($myconfig{show_form_details}));
- $form->{show_details} = $myconfig{show_form_details} unless (defined($form->{show_details}));
- # /about details
-
- # translations, unused commented out
-# $runningnumber = $locale->text('No.');
- $deliverydate = $locale->text('Delivery Date');
- $serialnumber = $locale->text('Serial No.');
- $projectnumber = $locale->text('Project');
-# $partsgroup = $locale->text('Group');
- $reqdate = $locale->text('Reqdate');
- $deliverydate = $locale->text('Required by');
-
- # special alignings
- my %align = map { $_ => 'right' } qw(qty ship right sellprice_pg discount linetotal);
-
- $form->{marge_total} = 0;
- $form->{sellprice_total} = 0;
- $form->{lastcost_total} = 0;
- my %projectnumber_labels = ();
- my @projectnumber_values = ("");
-
- foreach my $item (@{ $form->{"ALL_PROJECTS"} }) {
- push(@projectnumber_values, $item->{"id"});
- $projectnumber_labels{$item->{"id"}} = $item->{"projectnumber"};
- }
-
- # rows
- for $i (1 .. $numrows) {
-
- # undo formatting
- map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty ship discount sellprice price_new price_old) unless ($form->{simple_save});
-
-# unit begin
- $form->{"unit_old_$i"} ||= $form->{"unit_$i"};
- $form->{"selected_unit_$i"} ||= $form->{"unit_$i"};
-
- my $local_units = $form->{"inventory_accno_$i"} || $form->{"assembly_$i"} ? $dimension_units
- : $form->{"id_$i"} ? $service_units
- : $all_units;
- if ( !$local_units->{$form->{"selected_unit_$i"}} # Die ausgewaehlte Einheit ist fuer diesen Artikel nicht gueltig
- || !AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units)) { # (z.B. Dimensionseinheit war ausgewaehlt, es handelt sich aber
- $form->{"unit_old_$i"} = $form->{"selected_unit_$i"} = $form->{"unit_$i"}; # um eine Dienstleistung). Dann keinerlei Umrechnung vornehmen.
- }
- # adjust prices by unit, ignore if pricegroup changed
- if ((!$form->{"prices_$i"}) || ($form->{"new_pricegroup_$i"} == $form->{"old_pricegroup_$i"})) {
- $form->{"sellprice_$i"} *= AM->convert_unit($form->{"selected_unit_$i"}, $form->{"unit_old_$i"}, $all_units) || 1;
- $form->{"unit_old_$i"} = $form->{"selected_unit_$i"};
- }
- my $this_unit = $form->{"unit_$i"};
- $this_unit = $form->{"selected_unit_$i"} if AM->convert_unit($this_unit, $form->{"selected_unit_$i"}, $all_units);
- $this_unit ||= "kg";
-
- $column_data{"unit"} = AM->unit_select_html($local_units, "unit_$i", $this_unit, $form->{"id_$i"} ? $form->{"unit_$i"} : undef);
-# / unit ending
-
- $form->{"sellprice_$i"} =~ /\.(\d+)/;
- $decimalplaces = max 2, length $1;
-
- $discount = $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"} / 100, $decimalplaces);
- $linetotal = $form->round_amount($form->{"sellprice_$i"} - $discount, $decimalplaces);
- $linetotal = $form->round_amount($linetotal * $form->{"qty_$i"}, 2);
-
- # convert " to "
- map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit unit_old);
-
- $column_data{runningnumber} = $cgi->textfield(-name => "runningnumber_$i", -size => 5, -value => $i); # HuT
- $column_data{partnumber} = $cgi->textfield(-name => "partnumber_$i", -size => 12, -value => $form->{"partnumber_$i"});
- $column_data{description} = ((($rows = $form->numtextrows($form->{"description_$i"}, 30, 6)) > 1) # if description is too large, use a textbox instead
- ? $cgi->textarea( -name => "description_$i", -default => H($form->{"description_$i"}), -rows => $rows, -columns => 30)
- : $cgi->textfield(-name => "description_$i", -size => 30, -value => $form->quote($form->{"description_$i"})))
- . $cgi->button(-value => $locale->text('L'), -onClick => "set_longdescription_window('longdescription_$i')");
-
- $form->{"qty_$i"} =~ /\.(\d+)/;
- my $qty_dec = length $1;
-
- $column_data{qty} = $cgi->textfield(-name => "qty_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec));
- $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/'))
- . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"})
- if $form->{"formel_$i"};
- $column_data{ship} = $cgi->textfield(-name => "ship_$i", -size => 5, -value => $form->format_amount(\%myconfig, $form->{"ship_$i"}));
-
- # build in drop down list for pricesgroups
- if ($form->{"prices_$i"}) {
- $column_data{sellprice_pg} = qq||;
- $column_data{sellprice} = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => 'check_right_number_format(this)', -value =>
- (($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"})
- ? $form->format_amount(\%myconfig, $form->{"price_new_$i"}, $decimalplaces)
- : $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces)));
- } else {
- # for last row and report
- # set pricegroup drop down list from report menu
- if ($form->{"sellprice_$i"} != 0) {
- $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
- my $default_option = $form->{"sellprice_$i"}.'--'.$form->{"pricegroup_id_$i"};
- $column_data{sellprice_pg} = NTI($cgi->popup_menu("sellpricepg_$i", [ $default_option ], $default_option, { $default_option => $form->{"pricegroup_$i"} || '' }));
- } else {
- $column_data{sellprice_pg} = qq| |;
- }
- $column_data{sellprice} = $cgi->textfield(-name => "sellprice_$i", -size => 10, -onBlur => "check_right_number_format(this)", -value =>
- $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces));
- }
- $column_data{discount} = $cgi->textfield(-name => "discount_$i", -size => 3, -value => $form->format_amount(\%myconfig, $form->{"discount_$i"}));
- $column_data{linetotal} = $form->format_amount(\%myconfig, $linetotal, 2);
- $column_data{bin} = $form->{"bin_$i"};
-
- my @ROW1 = map { value => $column_data{$_}, align => $align{$_} }, @column_index;
-
- # second row
- my @ROW2 = ();
- push @ROW2, { value => qq|$serialnumber | }
- if $form->{type} !~ /_quotation/;
- push @ROW2, { value => qq|$projectnumber | . NTI($cgi->popup_menu('-name' => "project_id_$i", '-values' => \@projectnumber_values,
- '-labels' => \%projectnumber_labels, '-default' => $form->{"project_id_$i"})) };
- push @ROW2, { value => qq|$reqdate | }
- if $form->{type} =~ /order/;
- push @ROW2, { value => sprintf qq|%s |,
- $locale->text('Subtotal'), $form->{"subtotal_$i"} ? 'checked' : '' };
-
-# begin marge calculations
- my $marge_color;
- my $real_sellprice = $form->{"sellprice_$i"} - $discount;
-
- $form->{"lastcost_$i"} *= 1;
- $form->{"marge_percent_$i"} = 0;
-
- if ($real_sellprice && ($form->{"qty_$i"} * 1)) {
- $form->{"marge_percent_$i"} = ($real_sellprice - $form->{"lastcost_$i"}) * 100 / $real_sellprice;
- $myconfig{marge_percent_warn} ||= 15;
- $marge_color = 'color="#ff0000"' if $form->{"id_$i"} && ($form->{"marge_percent_$i"} < (1 * $myconfig{marge_percent_warn}));
- }
-
- my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1;
- $form->{"marge_absolut_$i"} = ($real_sellprice - $form->{"lastcost_$i"}) * $form->{"qty_$i"} * $marge_adjust_credit_note;
- $form->{"marge_total"} += $form->{"marge_absolut_$i"};
- $form->{"lastcost_total"} += $form->{"lastcost_$i"} * $form->{"qty_$i"};
- $form->{"sellprice_total"} += $real_sellprice * $form->{"qty_$i"};
-
- map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, 2) } qw(marge_absolut marge_percent);
-
- push @ROW2, { value => sprintf qq|%s %s %s%% %s %s %s %s|,
- $marge_color, $locale->text('Ertrag'),$form->{"marge_absolut_$i"}, $form->{"marge_percent_$i"},
- $locale->text('LP'), $form->format_amount(\%myconfig, $form->{"listprice_$i"}, 2),
- $locale->text('EK'), $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, 2) }
- if $form->{"id_$i"} && $form->{type} =~ /^sales_/;
-# / marge calculations ending
-
- my @HIDDENS = map { value => $_}, (
- $cgi->hidden("-name" => "unit_old_$i", "-value" => $form->{"selected_unit_$i"}),
- $cgi->hidden("-name" => "price_new_$i", "-value" => $form->format_amount(\%myconfig, $form->{"price_new_$i"})),
- map { ($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } map { $_."_$i" }
- qw(orderitems_id bo pricegroup_old price_old id inventory_accno bin partsgroup partnotes
- income_accno expense_accno listprice assembly taxaccounts ordnumber transdate cusordnumber
- longdescription basefactor marge_absolut marge_percent lastcost)
- );
-
- map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"}));
-
- $form->{invsubtotal} += $linetotal;
-
- push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, };
- }
-
- print $form->parse_html_template('oe/sales_order', { ROWS => \@ROWS,
- HEADER => \@HEADER,
- show_details_checked => ($form->{show_details} ? "checked" : ""),
- show_details_new => !$form->{show_details},
- });
-
- if (0 != ($form->{sellprice_total} * 1)) {
- $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
- }
-
- $lxdebug->leave_sub();
-}