X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fdo.pl;h=7924b05a21c5d52c433423c447503d6aaef2ed88;hb=adf1b8cbb7c9b2b49e73256ea66c6fed00e8466e;hp=9fa2b9096d7083831c70697070269a0f34332bed;hpb=2b88ba777cb754d5576107db85e7301020e51724;p=kivitendo-erp.git
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 9fa2b9096..7924b05a2 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -34,6 +34,7 @@ use List::Util qw(max sum);
use POSIX qw(strftime);
use YAML;
+use SL::DB::DeliveryOrder;
use SL::DO;
use SL::IR;
use SL::IS;
@@ -48,8 +49,6 @@ require "bin/mozilla/reportgenerator.pl";
use strict;
-my $print_post;
-
1;
# end of main
@@ -167,7 +166,7 @@ sub order_links {
$form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
# retrieve order/quotation
- $form->{webdav} = $main::webdav;
+ $form->{webdav} = $::lx_office_conf{features}->{webdav};
$form->{jsscript} = 1;
my $editing = $form->{id};
@@ -181,9 +180,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};
}
@@ -235,6 +234,7 @@ sub prepare_order {
$form->{"reqdate_$i"} = $form->{"deliverydate_$i"} unless $form->{"reqdate_$i"};
$form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"}, $decimalplaces);
+ $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"}, $decimalplaces);
(my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
$dec_qty = length $dec_qty;
@@ -338,7 +338,19 @@ sub update_delivery_order {
$payment_id = $form->{payment_id} if $form->{payment_id};
check_name($form->{vc});
-
+ $form->{discount} = $form->{"$form->{vc}_discount"} if defined $form->{"$form->{vc}_discount"};
+ # Problem: Wenn man ohne Erneuern einen Kunden/Lieferanten
+ # wechselt, wird der entsprechende Kunden/ Lieferantenrabatt
+ # nicht übernommen. Grundproblem: In Commit 82574e78
+ # hab ich aus discount customer_discount und vendor_discount
+ # gemacht und entsprechend an den Oberflächen richtig hin-
+ # geschoben. Die damals bessere Lösung wäre gewesen:
+ # In den Templates nur die hidden für form-discount wieder ein-
+ # setzen dann wäre die Verrenkung jetzt nicht notwendig.
+ # TODO: Ggf. Bugfix 1284, 1575 und 817 wieder zusammenführen
+ # Testfälle: Kunden mit Rabatt 0 -> Rabatt 20 i.O.
+ # Kunde mit Rabatt 20 -> Rabatt 0 i.O.
+ # Kunde mit Rabatt 20 -> Rabatt 5,5 i.O.
$form->{payment_id} = $payment_id if $form->{payment_id} eq "";
# for pricegroups
@@ -352,10 +364,13 @@ sub update_delivery_order {
} else {
+ my $mode;
if ($form->{type} eq 'purchase_delivery_order') {
IR->retrieve_item(\%myconfig, $form);
+ $mode = 'IR';
} else {
IS->retrieve_item(\%myconfig, $form);
+ $mode = 'IS';
}
my $rows = scalar @{ $form->{item_list} };
@@ -365,8 +380,8 @@ sub update_delivery_order {
if ($rows > 1) {
- select_item();
- exit;
+ select_item(mode => $mode);
+ ::end_of_request();
} else {
@@ -374,6 +389,7 @@ sub update_delivery_order {
$form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
$form->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"});
+ $form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"});
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
}
@@ -389,6 +405,7 @@ sub update_delivery_order {
&& ($form->{"description_$i"} eq "")) {
$form->{rowcount}--;
$form->{"discount_$i"} = "";
+ $form->{"not_discountable_$i"} = "";
display_form();
} else {
@@ -437,7 +454,7 @@ sub orders {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- my $cgi = $main::cgi;
+ my $cgi = $::request->{cgi};
($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
@@ -551,6 +568,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}";
@@ -592,6 +610,8 @@ sub orders {
sub save {
$main::lxdebug->enter_sub();
+ my (%params) = @_;
+
check_do_access();
my $form = $main::form;
@@ -617,7 +637,7 @@ sub save {
# if the name changed get new values
if (check_name($form->{vc})) {
update();
- exit;
+ ::end_of_request();
}
$form->{id} = 0 if $form->{saveasnew};
@@ -637,15 +657,15 @@ sub save {
if(!exists $form->{addition}) {
$form->{snumbers} = qq|donumber_| . $form->{donumber};
$form->{addition} = "SAVED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
$form->{simple_save} = 1;
- if(!$form->{print_and_save}) {
+ if (!$params{no_redirect} && !$form->{print_and_save}) {
set_headings("edit");
update();
- exit;
+ ::end_of_request();
}
$main::lxdebug->leave_sub();
}
@@ -683,12 +703,12 @@ sub delete_delivery_order {
if(!exists $form->{addition}) {
$form->{snumbers} = qq|donumber_| . $form->{donumber};
$form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->save_history;
}
# /saving the history
$form->info($locale->text('Delivery Order deleted!'));
- exit();
+ ::end_of_request();
}
$form->error($locale->text('Cannot delete delivery order!'));
@@ -732,11 +752,15 @@ sub invoice {
for my $i (1 .. $form->{rowcount}) {
# für bug 1284
- if ($form->{discount}){ # Falls wir einen Kundenrabatt haben
- # und keinen anderen discount wert an $i ...
- $form->{"discount_$i"} ||= $form->{discount}*100; # ... nehmen wir den kundenrabatt
+ unless ($form->{"ordnumber"}) {
+ if ($form->{discount}) { # Falls wir einen Lieferanten-/Kundenrabatt haben
+ # und rabattfähig sind, dann
+ unless ($form->{"not_discountable_$i"}) {
+ $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 basefactor);
+ map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice lastcost basefactor);
}
$form->{type} = "invoice";
@@ -750,6 +774,15 @@ sub invoice {
my $currency = $form->{currency};
invoice_links();
+ if ($form->{ordnumber}) {
+ require SL::DB::Order;
+ if (my $order = SL::DB::Manager::Order->find_by(ordnumber => $form->{ordnumber})) {
+ $order->load;
+ $form->{orddate} = $order->transdate_as_date;
+ $form->{$_} = $order->$_ for qw(payment_id salesman_id taxzone_id quonumber);
+ }
+ }
+
$form->{currency} = $currency;
$form->{exchangerate} = "";
$form->{forex} = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, $buysell);
@@ -769,10 +802,15 @@ sub invoice {
$form->{"deliverydate_$i"} = $form->{"reqdate_$i"}
unless $form->{"deliverydate_$i"};
+
$form->{"sellprice_$i"} =
$form->format_amount(\%myconfig, $form->{"sellprice_$i"},
$decimalplaces);
+ $form->{"lastcost_$i"} =
+ $form->format_amount(\%myconfig, $form->{"lastcost_$i"},
+ $decimalplaces);
+
(my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
$dec_qty = length $dec_qty;
$form->{"qty_$i"} =
@@ -840,15 +878,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->{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};
@@ -898,8 +956,6 @@ sub e_mail {
$form->{print_and_save} = 1;
- $print_post = 1;
-
my $saved_form = save_form();
save();
@@ -935,7 +991,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();
@@ -1004,7 +1060,7 @@ sub update_stock_in {
foreach my $i (1..$form->{rowcount}) {
$form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
- push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber qty unit) };
+ push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber bestbefore qty unit) };
}
display_stock_in_form($stock_info);
@@ -1033,12 +1089,15 @@ sub display_stock_in_form {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
+ $form->{jsscript} = 1;
+
$form->{title} = $locale->text('Stock');
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' });
@@ -1055,6 +1114,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();
@@ -1068,11 +1139,13 @@ sub set_stock_in {
next if ($form->{"qty_$i"} <= 0);
- push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber qty unit) };
+ push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber bestbefore qty unit) };
}
$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');
@@ -1107,7 +1180,8 @@ sub stock_out_form {
foreach my $sinfo (@{ $stock_info }) {
next if (($row->{bin_id} != $sinfo->{bin_id}) ||
($row->{warehouse_id} != $sinfo->{warehouse_id}) ||
- ($row->{chargenumber} ne $sinfo->{chargenumber}));
+ ($row->{chargenumber} ne $sinfo->{chargenumber}) ||
+ ($row->{bestbefore} ne $sinfo->{bestbefore}));
map { $row->{"stock_$_"} = $sinfo->{$_} } qw(qty unit error);
}
@@ -1147,6 +1221,7 @@ sub set_stock_out {
'warehouse_id' => $form->{"warehouse_id_$i"},
'bin_id' => $form->{"bin_id_$i"},
'chargenumber' => $form->{"chargenumber_$i"},
+ 'bestbefore' => $form->{"bestbefore_$i"},
'qty' => $form->{"qty_$i"},
'unit' => $form->{"unit_$i"},
'row' => $i,
@@ -1164,6 +1239,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');
}
@@ -1178,10 +1255,12 @@ sub transfer_in {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- if (DO->is_marked_as_delivered('id' => $form->{id})) {
+ if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) {
$form->show_generic_error($locale->text('The parts for this delivery order have already been transferred in.'), 'back_button' => 1);
}
+ save(no_redirect => 1);
+
my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_in_${_}"} } (1 .. $form->{rowcount});
my @all_requests;
@@ -1209,28 +1288,30 @@ sub transfer_in {
my $do_base_qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}) * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor;
- if ($do_base_qty != $row_sum_base_qty) {
- push @{ $form->{ERRORS} }, $locale->text('Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.',
- $i, $form->{"qty_$i"}, $form->{"unit_$i"});
- }
+# if ($do_base_qty != $row_sum_base_qty) {
+# push @{ $form->{ERRORS} }, $locale->text('Error in position #1: You must either assign no stock at all or the full quantity of #2 #3.',
+# $i, $form->{"qty_$i"}, $form->{"unit_$i"});
+# }
}
if (@{ $form->{ERRORS} }) {
push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
+ set_headings('edit');
update();
$main::lxdebug->leave_sub();
- exit 0;
+ ::end_of_request();
}
}
DO->transfer_in_out('direction' => 'in',
'requests' => \@all_requests);
- $form->{delivered} = 1;
+ SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1);
- save();
+ $form->{callback} = 'do.pl?action=edit&type=purchase_delivery_order&id=' . $form->escape($form->{id});
+ $form->redirect;
$main::lxdebug->leave_sub();
}
@@ -1242,10 +1323,12 @@ sub transfer_out {
my %myconfig = %main::myconfig;
my $locale = $main::locale;
- if (DO->is_marked_as_delivered('id' => $form->{id})) {
+ if ($form->{id} && DO->is_marked_as_delivered(id => $form->{id})) {
$form->show_generic_error($locale->text('The parts for this delivery order have already been transferred out.'), 'back_button' => 1);
}
+ save(no_redirect => 1);
+
my @part_ids = map { $form->{"id_${_}"} } grep { $form->{"id_${_}"} && $form->{"stock_out_${_}"} } (1 .. $form->{rowcount});
my @all_requests;
@@ -1265,8 +1348,9 @@ 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)});
+ my $map_key = join '--', ($form->{"id_$i"}, @{$request}{qw(warehouse_id bin_id chargenumber bestbefore)});
$request_map{$map_key} ||= $request;
$request_map{$map_key}->{sum_base_qty} ||= 0;
@@ -1278,12 +1362,12 @@ sub transfer_out {
next if (0 == $row_sum_base_qty);
- my $do_base_qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}) * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor;
+ my $do_base_qty = $form->{"qty_$i"} * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor;
- if ($do_base_qty != $row_sum_base_qty) {
- push @{ $form->{ERRORS} }, $locale->text('Error in position #1: You must either assign no transfer at all or the full quantity of #2 #3.',
- $i, $form->{"qty_$i"}, $form->{"unit_$i"});
- }
+# if ($do_base_qty != $row_sum_base_qty) {
+# push @{ $form->{ERRORS} }, $locale->text('Error in position #1: You must either assign no transfer at all or the full quantity of #2 #3.',
+# $i, $form->{"qty_$i"}, $form->{"unit_$i"});
+# }
}
if (%request_map) {
@@ -1292,7 +1376,7 @@ sub transfer_out {
my @contents = DO->get_item_availability('parts_id' => \@part_ids);
foreach my $inv (@contents) {
- my $map_key = join '--', @{$inv}{qw(parts_id warehouse_id bin_id chargenumber)};
+ my $map_key = join '--', @{$inv}{qw(parts_id warehouse_id bin_id chargenumber bestbefore)};
next unless ($request_map{$map_key});
@@ -1306,31 +1390,46 @@ sub transfer_out {
my $pinfo = $part_info_map{$request->{parts_id}};
my $binfo = $bin_info_map{$request->{bin_id}};
- push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, for the transfer of #5.",
- $pinfo->{description}, $binfo->{warehouse_description}, $binfo->{bin_description},
- $request->{chargenumber} ? $locale->text('chargenumber #1', $request->{chargenumber}) : $locale->text('no chargenumber'),
- $form->format_amount_units('amount' => $request->{sum_base_qty},
- 'part_unit' => $pinfo->{unit},
- 'conv_units' => 'convertible_not_smaller'));
+ if ($::lx_office_conf{features}->{show_best_before}) {
+ push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, #5, for the transfer of #6.",
+ $pinfo->{description},
+ $binfo->{warehouse_description},
+ $binfo->{bin_description},
+ $request->{chargenumber} ? $locale->text('chargenumber #1', $request->{chargenumber}) : $locale->text('no chargenumber'),
+ $request->{bestbefore} ? $locale->text('bestbefore #1', $request->{bestbefore}) : $locale->text('no bestbefore'),
+ $form->format_amount_units('amount' => $request->{sum_base_qty},
+ 'part_unit' => $pinfo->{unit},
+ 'conv_units' => 'convertible_not_smaller'));
+ } else {
+ push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, for the transfer of #5.",
+ $pinfo->{description},
+ $binfo->{warehouse_description},
+ $binfo->{bin_description},
+ $request->{chargenumber} ? $locale->text('chargenumber #1', $request->{chargenumber}) : $locale->text('no chargenumber'),
+ $form->format_amount_units('amount' => $request->{sum_base_qty},
+ 'part_unit' => $pinfo->{unit},
+ 'conv_units' => 'convertible_not_smaller'));
+ }
}
}
if (@{ $form->{ERRORS} }) {
push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
+ set_headings('edit');
update();
$main::lxdebug->leave_sub();
- exit 0;
+ ::end_of_request();
}
}
-
DO->transfer_in_out('direction' => 'out',
'requests' => \@all_requests);
- $form->{delivered} = 1;
+ SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1);
- save();
+ $form->{callback} = 'do.pl?action=edit&type=sales_delivery_order&id=' . $form->escape($form->{id});
+ $form->redirect;
$main::lxdebug->leave_sub();
}