X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=796118a120d60f9cee60a4b5544f58f79266eca5;hb=cf889668782d1ffbb76b9f28e1d36848544fa3b3;hp=0d5941cb0b4f5c9ed812891b6ae2e98c71ff9e5b;hpb=a590a6518025280c2d6e76c87641764ca6198521;p=kivitendo-erp.git diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 0d5941cb0..796118a12 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -179,9 +179,9 @@ sub order_links { # get customer / vendor if ($form->{vc} eq 'vendor') { IR->get_vendor(\%myconfig, \%$form); + $form->{discount} = $form->{vendor_discount}; } else { IS->get_customer(\%myconfig, \%$form); - # OFFEN tritt bug 1284 auch bei vendor auf? $form->{discount} = $form->{customer_discount}; } @@ -551,6 +551,7 @@ sub orders { 'attachment_basename' => $attachment_basename . 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'; # add sort and escape callback, this one we use for the add sub $form->{callback} = $href .= "&sort=$form->{sort}"; @@ -732,9 +733,9 @@ sub invoice { for my $i (1 .. $form->{rowcount}) { # für bug 1284 - if ($form->{discount}){ # Falls wir einen Kundenrabatt haben + if ($form->{discount}){ # Falls wir einen Lieferanten-/Kundenrabatt haben # und keinen anderen discount wert an $i ... - $form->{"discount_$i"} ||= $form->{discount}*100; # ... nehmen wir den kundenrabatt + $form->{"discount_$i"} ||= $form->{discount}*100; # ... nehmen wir diesen Rabatt } map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice lastcost basefactor); } @@ -845,15 +846,35 @@ sub invoice_multi { map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued); + # get vendor or customer discount + my $vc_discount; + my $saved_form = save_form(); + if ($form->{vc} eq 'vendor') { + IR->get_vendor(\%myconfig, \%$form); + $vc_discount = $form->{vendor_discount}; + } else { + IS->get_customer(\%myconfig, \%$form); + $vc_discount = $form->parse_amount(\%myconfig, $form->{customer_discount}); + } + restore_form($saved_form); + $form->{rowcount} = 0; foreach my $ref (@{ $form->{form_details} }) { $form->{rowcount}++; $ref->{reqdate} ||= $ref->{dord_transdate}; # copy transdates into each invoice row map { $form->{"${_}_$form->{rowcount}"} = $ref->{$_} } keys %{ $ref }; - map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice discount lastcost); + map { $form->{"${_}_$form->{rowcount}"} = $form->format_amount(\%myconfig, $ref->{$_}) } qw(qty sellprice lastcost); + + if ($vc_discount){ # falls wir einen Lieferanten/Kundenrabatt haben + # und keinen anderen discount wert an $i ... + $form->{"discount_$form->{rowcount}"} ||= $vc_discount; # ... nehmen wir diesen Rabatt + } + $form->{"discount_$form->{rowcount}"} = $form->{"discount_$form->{rowcount}"} * 100; #s.a. Bug 1151 # Anm.: Eine Änderung des discounts in der SL/DO.pm->retrieve (select (doi.discount * 100) as discount) ergibt in psql einen # Wert von 10.0000001490116. Ferner ist der Rabatt in der Rechnung dann bei 1.0 (?). Deswegen lasse ich das hier. jb 10.10.09 + + $form->{"discount_$form->{rowcount}"} = $form->format_amount(\%myconfig, $form->{"discount_$form->{rowcount}"}); } delete $form->{form_details}; @@ -938,7 +959,7 @@ sub calculate_stock_in_out { 'amount_unit' => $all_units->{$form->{"partunit_$i"}}->{base_unit}, 'conv_units' => 'convertible_not_smaller', 'max_places' => 2); - $content .= qq| |; + $content = qq|${content} |; $main::lxdebug->leave_sub(); @@ -1043,7 +1064,8 @@ sub display_stock_in_form { my $part_info = IC->get_basic_part_info('id' => $form->{parts_id}); my $units = AM->retrieve_units(\%myconfig, $form); - my $units_data = AM->unit_select_data($units, undef, undef, $part_info->{unit}); + # der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor + my $units_data = AM->unit_select_data($units, $form->{do_unit}, undef, $part_info->{unit}); $form->get_lists('warehouses' => { 'key' => 'WAREHOUSES', 'bins' => 'BINS' }); @@ -1060,6 +1082,18 @@ sub display_stock_in_form { $main::lxdebug->leave_sub(); } +sub _stock_in_out_set_qty_display { + my $stock_info = shift; + my $form = $::form; + my $all_units = AM->retrieve_all_units(); + my $sum = AM->sum_with_unit(map { $_->{qty}, $_->{unit} } @{ $stock_info }); + $form->{qty_display} = $form->format_amount_units(amount => $sum * 1, + part_unit => $form->{partunit}, + amount_unit => $all_units->{ $form->{partunit} }->{base_unit}, + conv_units => 'convertible_not_smaller', + max_places => 2); +} + sub set_stock_in { $main::lxdebug->enter_sub(); @@ -1078,6 +1112,8 @@ sub set_stock_in { $form->{stock} = YAML::Dump($stock_info); + _stock_in_out_set_qty_display($stock_info); + $form->header(); print $form->parse_html_template('do/set_stock_in_out'); @@ -1171,6 +1207,8 @@ sub set_stock_out { stock_in_out_form(); } else { + _stock_in_out_set_qty_display($stock_info); + $form->header(); print $form->parse_html_template('do/set_stock_in_out'); } @@ -1272,6 +1310,7 @@ sub transfer_out { foreach my $request (@{ DO->unpack_stock_information('packed' => $form->{"stock_out_$i"}) }) { $request->{parts_id} = $form->{"id_$i"}; $request->{base_qty} = $request->{qty} * $units->{$request->{unit}}->{factor} / $base_unit_factor; + $request->{project_id} = $form->{"project_id_$i"} ? $form->{"project_id_$i"} : $form->{globalproject_id}; my $map_key = join '--', ($form->{"id_$i"}, @{$request}{qw(warehouse_id bin_id chargenumber bestbefore)}); @@ -1345,7 +1384,6 @@ sub transfer_out { ::end_of_request(); } } - DO->transfer_in_out('direction' => 'out', 'requests' => \@all_requests);