X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fio.pl;h=03ca708546cdafb64f40c15d4015ac8a8ba9d75a;hb=95ecb4289e58990f441f0273182c55f45f26bfb6;hp=d799a0c1c382cb0195a179f90aef02a392fd7bb8;hpb=ee90bef1624e0a71ed2bdc0807701cda64b58b4f;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index d799a0c1c..03ca70854 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -159,6 +159,7 @@ sub display_row { ); my @column_index = map { $_->{id} } grep { $_->{display} } @HEADER; + # cache units my $all_units = AM->retrieve_units(\%myconfig, $form); @@ -209,7 +210,9 @@ sub display_row { my %column_data = (); # undo formatting - map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(qty discount sellprice price_new price_old) unless ($form->{simple_save}); + map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } + qw(qty discount sellprice lastcost price_new price_old) + unless ($form->{simple_save}); # unit begin $form->{"unit_old_$i"} ||= $form->{"unit_$i"}; @@ -226,7 +229,6 @@ sub display_row { } 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"; if (0 < scalar @{ $form->{ALL_PRICE_FACTORS} }) { my @values = ('', map { $_->{id} } @{ $form->{ALL_PRICE_FACTORS} }); @@ -294,6 +296,7 @@ sub display_row { } $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); @@ -317,28 +320,31 @@ sub display_row { $locale->text('Subtotal'), $form->{"subtotal_$i"} ? 'checked' : '' }; # begin marge calculations - my $marge_color; - my $real_sellprice = ($form->{"sellprice_$i"} - $discount) / $price_factor; - my $marge_price_factor = $form->{"marge_price_factor_$i"} * 1 || 1; - - $form->{"lastcost_$i"} *= 1; + $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"} / $marge_price_factor) * 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_color; + my $real_sellprice = $linetotal; + my $real_lastcost = $form->{"lastcost_$i"} * $form->{"qty_$i"} / ( $form->{"marge_price_factor_$i"} || 1 ); + my $marge_percent_warn = $myconfig{marge_percent_warn} * 1 || 15; + my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1; + + if ($real_sellprice * 1 && ($form->{"qty_$i"} * 1)) { + $form->{"marge_percent_$i"} = ($real_sellprice - $real_lastcost) * 100 / $real_sellprice; + $marge_color = 'color="#ff0000"' if $form->{"id_$i"} && $form->{"marge_percent_$i"} < $marge_percent_warn; } - my $marge_adjust_credit_note = $form->{type} eq 'credit_note' ? -1 : 1; - $form->{"marge_absolut_$i"} = ($real_sellprice - $form->{"lastcost_$i"} / $marge_price_factor) * $form->{"qty_$i"} * $marge_adjust_credit_note; + $form->{"marge_absolut_$i"} = ($real_sellprice - $real_lastcost) * $marge_adjust_credit_note; $form->{"marge_total"} += $form->{"marge_absolut_$i"}; - $form->{"lastcost_total"} += $form->{"lastcost_$i"} * $form->{"qty_$i"} / $marge_price_factor; - $form->{"sellprice_total"} += $real_sellprice * $form->{"qty_$i"}; + $form->{"lastcost_total"} += $real_lastcost; + $form->{"sellprice_total"} += $real_sellprice; 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|, + push @ROW2, { value => sprintf qq| + %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) } @@ -361,8 +367,8 @@ sub display_row { my @hidden_vars; if ($is_delivery_order) { - map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount); - push @hidden_vars, qw(sellprice discount price_factor_id); + map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount lastcost); + push @hidden_vars, qw(sellprice discount price_factor_id lastcost); push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}"; } @@ -372,7 +378,7 @@ sub display_row { 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 marge_price_factor lastcost), @hidden_vars) + longdescription basefactor marge_absolut marge_percent marge_price_factor), @hidden_vars) ); map { $form->{"${_}_base"} += $linetotal } (split(/ /, $form->{"taxaccounts_$i"})); @@ -668,7 +674,7 @@ sub item_selected { map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}, $decimalplaces) - } qw(sellprice listprice) if $form->{item} ne 'assembly'; + } qw(sellprice listprice lastcost) if $form->{item} ne 'assembly'; # get pricegroups for parts IS->get_pricegroups_for_parts(\%myconfig, \%$form); @@ -750,7 +756,7 @@ sub check_form { #($form->{"sellprice_$i"},$form->{"$pricegroup_old_$i"}) = split /--/, $form->{"sellprice_$i"}; # fuer assemblies auskommentiert. siehe oben - # $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1)); + # $form->{sellprice} += ($form->{"qty_$i"} * $form->{"sellprice_$i"} / ($form->{"price_factor_$i"} || 1)); $form->{weight} += ($form->{"qty_$i"} * $form->{"weight_$i"} / ($form->{"price_factor_$i"} || 1)); $count++; } @@ -765,44 +771,9 @@ sub check_form { map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) } qw(listprice sellprice lastcost); } else { - my @flds = qw(id partnumber description qty ship sellprice unit - discount inventory_accno income_accno expense_accno listprice - taxaccounts bin assembly weight projectnumber project_id - oldprojectnumber runningnumber serialnumber partsgroup payment_id - not_discountable shop ve gv buchungsgruppen_id language_values - sellprice_pg pricegroup_old price_old price_new unit_old ordnumber - transdate longdescription basefactor marge_total marge_percent - marge_price_factor lastcost price_factor_id partnotes - stock_out stock_in has_sernumber); - - my $ic_cvar_configs = CVar->get_configs(module => 'IC'); - push @flds, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; - - # this section applies to invoices and orders - # remove any empty numbers - if ($form->{rowcount}) { - for my $i (1 .. $form->{rowcount} - 1) { - if ($form->{"partnumber_$i"}) { - push @a, {}; - my $j = $#a; - - map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds; - $count++; - if ($main::lizenzen) { - if ($form->{"licensenumber_$i"} == -1) { - &new_license($i); - exit; - } - } - } - } - - $form->redo_rows(\@flds, \@a, $count, $form->{rowcount}); - $form->{rowcount} = $count; + remove_emptied_rows(1); - $form->{creditremaining} -= &invoicetotal; - - } + $form->{creditremaining} -= &invoicetotal; } #sk @@ -825,6 +796,37 @@ sub check_form { $main::lxdebug->leave_sub(); } +sub remove_emptied_rows { + my $dont_add_empty = shift; + my $form = $::form; + + return unless $form->{rowcount}; + + my @flds = qw(id partnumber description qty ship sellprice unit + discount inventory_accno income_accno expense_accno listprice + taxaccounts bin assembly weight projectnumber project_id + oldprojectnumber runningnumber serialnumber partsgroup payment_id + not_discountable shop ve gv buchungsgruppen_id language_values + sellprice_pg pricegroup_old price_old price_new unit_old ordnumber + transdate longdescription basefactor marge_total marge_percent + marge_price_factor lastcost price_factor_id partnotes + stock_out stock_in has_sernumber reqdate); + + my $ic_cvar_configs = CVar->get_configs(module => 'IC'); + push @flds, map { "ic_cvar_$_->{name}" } @{ $ic_cvar_configs }; + + my @new_rows; + for my $i (1 .. $form->{rowcount} - 1) { + next unless $form->{"partnumber_$i"}; + + push @new_rows, { map { $_ => $form->{"${_}_$i" } } @flds }; + } + + my $new_rowcount = scalar @new_rows; + $form->redo_rows(\@flds, \@new_rows, $new_rowcount, $form->{rowcount}); + $form->{rowcount} = $new_rowcount + ($dont_add_empty ? 0 : 1); +} + sub invoicetotal { $main::lxdebug->enter_sub(); @@ -879,7 +881,7 @@ sub validate_items { # check if items are valid if ($form->{rowcount} == 1) { &update; - exit; + ::end_of_request(); } for my $i (1 .. $form->{rowcount} - 1) { @@ -1038,9 +1040,9 @@ sub edit_e_mail { $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/; - if ($form->{"cp_id"} && !$form->{"email"}) { + if ($form->{"cp_id"}) { CT->get_contact(\%myconfig, $form); - $form->{"email"} = $form->{"cp_email"}; + $form->{"email"} = $form->{"cp_email"} if $form->{"cp_email"}; } my $title = $locale->text('E-mail') . " " . $form->get_formname_translation(); @@ -1149,7 +1151,6 @@ sub print_options { ) : undef, ($form->{type} eq 'invoice' && $form->{storno}) ? ( opthash("storno_invoice", $form->{PD}{storno_invoice}, $locale->text('Storno Invoice')), - opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List')) ) : undef, ($form->{type} =~ /_delivery_order$/) ? ( opthash($form->{type}, $form->{PD}{$form->{type}}, $locale->text('Delivery Order')), @@ -1163,7 +1164,7 @@ sub print_options { push @MEDIA, grep $_, opthash("screen", $form->{OP}{screen}, $locale->text('Screen')), - (scalar @{ $form->{printers} } && $main::latex_templates) ? + ($form->{printers} && scalar @{ $form->{printers} } && $main::latex_templates) ? opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef, ($main::latex_templates && !$options{no_queue}) ? opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef @@ -1181,7 +1182,9 @@ sub print_options { (!$options{no_html}) ? opthash("html", $form->{DF}{html}, "HTML") : undef, ($main::opendocument_templates && !$options{no_opendocument}) ? - opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef; + opthash("opendocument", $form->{DF}{opendocument}, $locale->text("OpenDocument/OASIS")) : undef, + ($main::excel_templates && !$options{no_excel}) ? + opthash("excel", $form->{DF}{excel}, $locale->text("Excel")) : undef; push @LANGUAGE_ID, map { opthash($_->{id}, ($_->{id} eq $form->{language_id} ? 'selected' : ''), $_->{description}) } +{}, @{ $form->{languages} } @@ -1260,7 +1263,8 @@ sub print { &save(); $form->{formname} = $formname; &edit(); - exit; + $::lxdebug->leave_sub(); + ::end_of_request(); } &print_form($old_form); @@ -1293,11 +1297,6 @@ sub print_form { if ($form->{formname} eq "invoice") { $form->{label} = $locale->text('Invoice'); } - if ($form->{formname} eq "packing_list") { - - # this is from an invoice - $form->{label} = $locale->text('Packing List'); - } if ($form->{formname} eq 'sales_order') { $inv = "ord"; $due = "req"; @@ -1327,17 +1326,6 @@ sub print_form { $order = 1; } - if ($form->{formname} eq 'packing_list' && $form->{type} ne 'invoice') { - - # we use the same packing list as from an invoice - $inv = "ord"; - $due = "req"; - $form->{invdate} = $form->{"${inv}date"} = $form->{transdate}; - $form->{label} = $locale->text('Packing List'); - $order = 1; - # set invnumber for template packing_list - $form->{invnumber} = $form->{ordnumber}; - } if ($form->{formname} eq 'purchase_order') { $inv = "ord"; $due = "req"; @@ -1398,8 +1386,6 @@ sub print_form { # $locale->text('Invoice Number missing!') # $locale->text('Invoice Date missing!') - # $locale->text('Packing List Number missing!') - # $locale->text('Packing List Date missing!') # $locale->text('Order Number missing!') # $locale->text('Order Date missing!') # $locale->text('Quotation Number missing!') @@ -1421,13 +1407,13 @@ sub print_form { call_sub($display_form); # saving the history - if(!exists $form->{addition}) { + if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; - $form->{addition} = "PRINTED"; - $form->save_history($form->dbconnect(\%myconfig)); + $form->{addition} = "PRINTED"; + $form->save_history; } # /saving the history - exit; + ::end_of_request(); } } @@ -1589,6 +1575,9 @@ sub print_form { } elsif ($form->{"format"} =~ /opendocument/) { $form->{opendocument} = 1; $extension = 'odt'; + } elsif ($form->{"format"} =~ /excel/) { + $form->{excel} = 1; + $extension = 'xls'; } my $email_extension = '_email' if (($form->{media} eq 'email') && (-f "$myconfig{templates}/$form->{formname}_email$form->{language}${printer_code}.${extension}")); @@ -1641,18 +1630,18 @@ sub print_form { if(!exists $form->{addition}) { $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; if($form->{media} =~ /printer/) { - $form->{addition} = "PRINTED"; + $form->{addition} = "PRINTED"; } elsif($form->{media} =~ /email/) { - $form->{addition} = "MAILED"; + $form->{addition} = "MAILED"; } elsif($form->{media} =~ /queue/) { - $form->{addition} = "QUEUED"; + $form->{addition} = "QUEUED"; } elsif($form->{media} =~ /screen/) { - $form->{addition} = "SCREENED"; + $form->{addition} = "SCREENED"; } - $form->save_history($form->dbconnect(\%myconfig)); + $form->save_history; } # /saving the history @@ -1697,7 +1686,7 @@ sub print_form { } call_sub($display_form); - exit; + ::end_of_request(); } my $msg = @@ -1708,7 +1697,7 @@ sub print_form { } if ($form->{printing}) { call_sub($display_form); - exit; + ::end_of_request(); } $main::lxdebug->leave_sub(); @@ -1773,7 +1762,7 @@ sub ship_to { my @shipto_vars = qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry - shiptocontact shiptophone shiptofax shiptoemail + shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail shiptodepartment_1 shiptodepartment_2); my @addr_vars = @@ -1788,6 +1777,19 @@ sub ship_to { ? $locale->text('Customer Number') : $locale->text('Vendor Number'); + # sieht nicht nett aus, funktioniert aber + # das vorausgewählte select-feld wird über shiptocp_gender + # entsprechend vorbelegt + my $selected_m=''; + my $selected_f=''; + if ($form->{shiptocp_gender} eq 'm') { + $selected_m='selected'; + $selected_f=''; + } elsif ($form->{shiptocp_gender} eq 'f') { + $selected_m=''; + $selected_f='selected'; + } + # get pricegroups for parts IS->get_pricegroups_for_parts(\%myconfig, \%$form); @@ -1809,72 +1811,81 @@ sub ship_to {
| + | |||
---|---|---|---|
| . $locale->text('Billing Address') . qq| | -| + | | . $locale->text('Shipping Address') . qq| | -|
$number | -$form->{"$form->{vc}number"} | -||
| . $locale->text('Company Name') . qq| | -$form->{name} | -- | |
| . $locale->text('Department') . qq| | -$form->{department_1} | -- | |
- | $form->{department_2} | -- | |
| . $locale->text('Street') . qq| | -$form->{street} | -- | |
| . $locale->text('Zipcode') . qq| | -$form->{zipcode} | -- | |
| . $locale->text('City') . qq| | -$form->{city} | -- | |
| . $locale->text('Country') . qq| | -$form->{country} | -- | |
| . $locale->text('Contact') . qq| | -$form->{contact} | -- | |
| . $locale->text('Phone') . qq| | -$form->{phone} | -- | |
| . $locale->text('Fax') . qq| | -$form->{fax} | -- | |
| . $locale->text('E-mail') . qq| | -$form->{email} | -- | |
$number | +$form->{"$form->{vc}number"} | +||
| . $locale->text('Company Name') . qq| | +$form->{name} | ++ | |
| . $locale->text('Department') . qq| | +$form->{department_1} | ++ | |
+ | $form->{department_2} | ++ | |
| . $locale->text('Street') . qq| | +$form->{street} | ++ | |
| . $locale->text('Zipcode') . qq| | +$form->{zipcode} | ++ | |
| . $locale->text('City') . qq| | +$form->{city} | ++ | |
| . $locale->text('Country') . qq| | +$form->{country} | ++ | |
| . $locale->text('Contact') . qq| | +$form->{contact} | ++ | |
| . $locale->text('Gender') . qq| | ++ | + | +|
| . $locale->text('Phone') . qq| | +$form->{phone} | ++ | |
| . $locale->text('Fax') . qq| | +$form->{fax} | ++ | |
| . $locale->text('E-mail') . qq| | +$form->{email} | ++ |