X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=dfbd983513df0f3030be7a721e183085d0bcfc5b;hb=cb25314000db992f8b413d10a0d20f0e80b4b677;hp=911c90edb1a5dec99092bd713dd6694b095b995f;hpb=a53233e56a9d4001b47bcf412b4bfe46910d3117;p=kivitendo-erp.git
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 911c90edb..54c650c31 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -1,4 +1,4 @@
-# #=====================================================================
+#=====================================================================
# LX-Office ERP
# Copyright (C) 2004
# Based on SQL-Ledger Version 2.1.9
@@ -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;
@@ -46,21 +47,26 @@ require "bin/mozilla/invoice_io.pl";
require "bin/mozilla/io.pl";
require "bin/mozilla/reportgenerator.pl";
+use strict;
+
1;
# end of main
sub check_do_access {
- $auth->assert($form->{type} . '_edit');
+ $main::auth->assert($main::form->{type} . '_edit');
}
sub set_headings {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
my ($action) = @_;
+ my $form = $main::form;
+ my $locale = $main::locale;
+
if ($form->{type} eq 'purchase_delivery_order') {
$form->{vc} = 'vendor';
$form->{title} = $action eq "edit" ? $locale->text('Edit Purchase Delivery Order') : $locale->text('Add Purchase Delivery Order');
@@ -71,14 +77,16 @@ sub set_headings {
$form->{heading} = $locale->text('Delivery Order');
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub add {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+
set_headings("add");
$form->{callback} = build_std_url('action=add', 'type', 'vc') unless ($form->{callback});
@@ -87,14 +95,16 @@ sub add {
prepare_order();
display_form();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub edit {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+
# show history button
$form->{javascript} = qq||;
#/show hhistory button
@@ -111,17 +121,19 @@ sub edit {
# reset rowcount
undef $form->{rowcount};
add();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return;
# }
} elsif (!$form->{id}) {
add();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return;
}
+ my ($language_id, $printer_id);
if ($form->{print_and_save}) {
- $form->{action} = "print";
+ $form->{action} = "dispatcher";
+ $form->{action_print} = "1";
$form->{resubmit} = 1;
$language_id = $form->{language_id};
$printer_id = $form->{printer_id};
@@ -139,33 +151,44 @@ sub edit {
display_form();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub order_links {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
# get customer/vendor
$form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
# retrieve order/quotation
- $form->{webdav} = $webdav;
+ $form->{webdav} = $::lx_office_conf{features}->{webdav};
$form->{jsscript} = 1;
my $editing = $form->{id};
- DO->retrieve();
+ DO->retrieve('vc' => $form->{vc},
+ 'ids' => $form->{id});
- $payment_id = $form->{payment_id} if ($form->{payment_id});
- $language_id = $form->{language_id} if ($form->{language_id});
- $taxzone_id = $form->{taxzone_id} if ($form->{taxzone_id});
- $salesman_id = $form->{salesman_id} if ($editing);
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes));
+ $form->{shipto} = 1 if $form->{id};
+ # get customer / vendor
+ if ($form->{vc} eq 'vendor') {
+ IR->get_vendor(\%myconfig, \%$form);
+ $form->{discount} = $form->{vendor_discount};
+ } else {
+ IS->get_customer(\%myconfig, \%$form);
+ $form->{discount} = $form->{customer_discount};
+ }
- $taxincluded = $form->{taxincluded};
- $form->{shipto} = 1 if $form->{id};
+ $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id));
+ $form->restore_vars(qw(taxincluded)) if $form->{id};
+ $form->restore_vars(qw(salesman_id)) if $editing;
if ($form->{"all_$form->{vc}"}) {
unless ($form->{"$form->{vc}_id"}) {
@@ -173,37 +196,26 @@ sub order_links {
}
}
- $cp_id = $form->{cp_id};
- $intnotes = $form->{intnotes};
-
- $form->{cp_id} = $cp_id;
-
- $form->{payment_id} = $payment_id if ($payment_id);
- $form->{language_id} = $language_id if ($language_id);
- $form->{taxzone_id} = $taxzone_id if ($taxzone_id);
- $form->{intnotes} = $intnotes if ($intnotes);
-
($form->{ $form->{vc} }) = split /--/, $form->{ $form->{vc} };
$form->{"old$form->{vc}"} = qq|$form->{$form->{vc}}--$form->{"$form->{vc}_id"}|;
- $form->{taxincluded} = $taxincluded if ($form->{id});
-
$form->{employee} = "$form->{employee}--$form->{employee_id}";
- $form->{salesman_id} = $salesman_id if ($editing);
-
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub prepare_order {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
$form->{formname} = $form->{type} unless $form->{formname};
my $i = 0;
- foreach $ref (@{ $form->{form_details} }) {
+ foreach my $ref (@{ $form->{form_details} }) {
$form->{rowcount} = ++$i;
map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
@@ -214,30 +226,32 @@ sub prepare_order {
} else {
$form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"});
}
- ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
+ my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
$dec = length $dec;
- $decimalplaces = ($dec > 2) ? $dec : 2;
+ my $decimalplaces = ($dec > 2) ? $dec : 2;
# copy reqdate from deliverydate for invoice -> order conversion
$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;
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
-
- map { $form->{"${_}_$i"} =~ s/\"/"/g } qw(partnumber description unit);
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub form_header {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
$form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
$form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
@@ -245,7 +259,7 @@ sub form_header {
$form->{jsscript} = 1;
#write Trigger
- $jsscript = Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", "reqdate", "BL", "trigger2");
+ my $jsscript = Form->write_trigger(\%myconfig, "2", "transdate", "BL", "trigger1", "reqdate", "BL", "trigger2");
my @old_project_ids = ($form->{"globalproject_id"});
map({ push(@old_project_ids, $form->{"project_id_$_"})
@@ -280,44 +294,67 @@ sub form_header {
if ($form->{format} eq "html") {
$form->{onload} = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
}
+ # emulate click for resubmitting actions
+ $form->{onload} .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
$form->{onload} .= "document.do.submit();"
}
$form->header();
+ # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
+ $form->{department} .= '--' . $form->{department_id};
+
print $form->parse_html_template('do/form_header');
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub form_footer {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+
$form->{PRINT_OPTIONS} = print_options('inline' => 1);
print $form->parse_html_template('do/form_footer');
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub update_delivery_order {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
set_headings($form->{"id"} ? "edit" : "add");
$form->{update} = 1;
+ my $payment_id;
$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
- $i = $form->{rowcount};
+ my $i = $form->{rowcount};
if ( ($form->{"partnumber_$i"} eq "")
&& ($form->{"description_$i"} eq "")
@@ -327,29 +364,32 @@ 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} };
if ($rows) {
- $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
+ $form->{"qty_$i"} = 1 unless $form->parse_amount(\%myconfig, $form->{"qty_$i"});
if ($rows > 1) {
- select_item();
- exit;
+ select_item(mode => $mode);
+ ::end_of_request();
} else {
- map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit);
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
$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"});
}
@@ -365,6 +405,7 @@ sub update_delivery_order {
&& ($form->{"description_$i"} eq "")) {
$form->{rowcount}--;
$form->{"discount_$i"} = "";
+ $form->{"not_discountable_$i"} = "";
display_form();
} else {
@@ -374,15 +415,19 @@ sub update_delivery_order {
}
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub search {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
- $form->{vc} = $form->{type} eq 'purchase_order' ? 'vendor' : 'customer';
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ $form->{vc} = $form->{type} eq 'purchase_delivery_order' ? 'vendor' : 'customer';
$form->get_lists("projects" => { "key" => "ALL_PROJECTS",
"all" => 1 },
@@ -398,24 +443,29 @@ sub search {
print $form->parse_html_template('do/search');
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub orders {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
- ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} });
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my $cgi = $main::cgi;
- $form->{sort} ||= 'transdate';
+ ($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
+
+ report_generator_set_default_sort('transdate', 1);
DO->transactions();
$form->{rowcount} = scalar @{ $form->{DO} };
my @columns = qw(
- transdate
+ ids transdate
id donumber
ordnumber
name employee
@@ -435,7 +485,7 @@ sub orders {
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber
- transaction_description transdatefrom transdateto type vc employee_id salesman_id);
+ transaction_description transdatefrom transdateto type vc employee_id salesman_id project_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
@@ -446,7 +496,7 @@ sub orders {
'donumber' => { 'text' => $locale->text('Delivery Order'), },
'ordnumber' => { 'text' => $locale->text('Order'), },
'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
- 'employee' => { 'text' => $locale->text('Salesperson'), },
+ 'employee' => { 'text' => $locale->text('Employee'), },
'shipvia' => { 'text' => $locale->text('Ship via'), },
'globalprojectnumber' => { 'text' => $locale->text('Project Number'), },
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
@@ -454,20 +504,22 @@ sub orders {
'delivered' => { 'text' => $locale->text('Delivered'), },
);
- foreach my $name (qw(id transdate donumber ordnumber name employee shipvia)) {
- $column_defs{$name}->{link} = $href . "&sort=$name";
+ foreach my $name (qw(id transdate donumber ordnumber name employee shipvia transaction_description)) {
+ my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+ $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
$form->{"l_type"} = "Y";
map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
- $column_defs{ids}->{visible} = $allow_multiple_orders ? 'HTML' : 0;
+
+ $column_defs{ids}->{visible} = 'HTML';
$report->set_columns(%column_defs);
$report->set_column_order(@columns);
- $report->set_export_options('orders', @hidden_variables);
+ $report->set_export_options('orders', @hidden_variables, qw(sort sortdir));
- $report->set_sort_indicator($form->{sort}, 1);
+ $report->set_sort_indicator($form->{sort}, $form->{sortdir});
my @options;
if ($form->{customer}) {
@@ -477,7 +529,7 @@ sub orders {
push @options, $locale->text('Vendor') . " : $form->{vendor}";
}
if ($form->{department}) {
- ($department) = split /--/, $form->{department};
+ my ($department) = split /--/, $form->{department};
push @options, $locale->text('Department') . " : $department";
}
if ($form->{donumber}) {
@@ -490,10 +542,10 @@ sub orders {
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
}
if ($form->{transdatefrom}) {
- push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
}
if ($form->{transdateto}) {
- push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
}
if ($form->{open}) {
push @options, $locale->text('Open');
@@ -508,44 +560,64 @@ sub orders {
push @options, $locale->text('Not delivered');
}
- $report->set_options('top_info_text' => join("\n", @options),
- 'output_format' => 'HTML',
- 'title' => $form->{title},
- 'attachment_basename' => $attachment_basename . strftime('_%Y%m%d', localtime time),
+ $report->set_options('top_info_text' => join("\n", @options),
+ 'raw_top_info_text' => $form->parse_html_template('do/orders_top'),
+ 'raw_bottom_info_text' => $form->parse_html_template('do/orders_bottom'),
+ 'output_format' => 'HTML',
+ 'title' => $form->{title},
+ '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}";
# escape callback for href
- $callback = $form->escape($href);
+ my $callback = $form->escape($href);
my $edit_url = build_std_url('action=edit', 'type', 'vc');
my $edit_order_url = build_std_url('script=oe.pl', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'), 'action=edit');
- foreach $dord (@{ $form->{DO} }) {
+ my $idx = 1;
+
+ foreach my $dord (@{ $form->{DO} }) {
$dord->{open} = $dord->{closed} ? $locale->text('No') : $locale->text('Yes');
$dord->{delivered} = $dord->{delivered} ? $locale->text('Yes') : $locale->text('No');
my $row = { map { $_ => { 'data' => $dord->{$_} } } @columns };
+ $row->{ids} = {
+ 'raw_data' => $cgi->hidden('-name' => "trans_id_${idx}", '-value' => $dord->{id})
+ . $cgi->checkbox('-name' => "multi_id_${idx}", '-value' => 1, '-label' => ''),
+ 'valign' => 'center',
+ 'align' => 'center',
+ };
+
$row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}";
$row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}";
$report->add_data($row);
+
+ $idx++;
}
$report->generate_with_headers();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub save {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my (%params) = @_;
check_do_access();
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
$form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
$form->isblank("transdate", $locale->text('Delivery Order Date missing!'));
@@ -553,46 +625,59 @@ sub save {
$form->{donumber} =~ s/^\s*//g;
$form->{donumber} =~ s/\s*$//g;
- $msg = ucfirst $form->{vc};
+ my $msg = ucfirst $form->{vc};
$form->isblank($form->{vc}, $locale->text($msg . " missing!"));
# $locale->text('Customer missing!');
# $locale->text('Vendor missing!');
+ remove_emptied_rows();
validate_items();
# if the name changed get new values
if (check_name($form->{vc})) {
update();
- exit;
+ ::end_of_request();
}
$form->{id} = 0 if $form->{saveasnew};
-
+ # best case fix für bug 1079. Einkaufsrabatt wird nicht richtig
+ # aus Lieferantenauftrag -> Lieferschein -> Rechnung übernommen
+ # Tritt nur auf, wenn man direkt über Lieferschein -> speichern ->
+ # Workflow Rechnung geht (beim Aufruf über edit() i.O.)
+ # Gut. DO-save() speichert den Discount im DB-Format 0.12 für
+ # 12%, die Konvertierung wird leider in $form gemacht und daher
+ # wird die Maske mit dem falschen Rabatt wieder aufgebaut.
+ # Wie immer: backup_vars verwenden um nichts anderes kaputt zu
+ # machen. jan 03.03.2010
+ # nicht mehr notwendig da für bug 1284 der backend aufruf entsprechend
+ # geändert wurde
DO->save();
-
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|donumber_| . $form->{donumber};
- $form->{addition} = "SAVED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "SAVED";
+ $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();
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub delete {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+ my $locale = $main::locale;
+
map { delete $form->{$_} } qw(action header login password);
my @variables = map { { 'key' => $_, 'value' => $form->{$_} } } grep { '' eq ref $form->{$_} } keys %{ $form };
@@ -601,52 +686,62 @@ sub delete {
print $form->parse_html_template('do/delete', { 'VARIABLES' => \@variables });
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub delete_delivery_order {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
if (DO->delete()) {
# saving the history
if(!exists $form->{addition}) {
$form->{snumbers} = qq|donumber_| . $form->{donumber};
- $form->{addition} = "DELETED";
- $form->save_history($form->dbconnect(\%myconfig));
+ $form->{addition} = "DELETED";
+ $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!'));
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub invoice {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
check_do_access();
- $auth->assert($form->{type} eq 'purchase_order' || $form->{type} eq 'request_quotation' ? 'vendor_invoice_edit' : 'invoice_edit');
+ $main::auth->assert($form->{type} eq 'purchase_delivery_order' ? 'vendor_invoice_edit' : 'invoice_edit');
- $form->{deliverydate} = $form->{transdate};
- $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
- $form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+ $form->{convert_from_do_ids} = $form->{id};
+ $form->{deliverydate} = $form->{transdate};
+ $form->{transdate} = $form->{invdate} = $form->current_date(\%myconfig);
+ $form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
- $form->{id} = '';
- $form->{closed} = 0;
$form->{rowcount}--;
- $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+ delete @{$form}{qw(id closed delivered)};
+ my ($script, $buysell);
if ($form->{type} eq 'purchase_delivery_order') {
$form->{title} = $locale->text('Add Vendor Invoice');
$form->{script} = 'ir.pl';
$script = "ir";
+ $buysell = 'sell';
} else {
$form->{title} = $locale->text('Add Sales Invoice');
@@ -655,20 +750,39 @@ sub invoice {
$buysell = 'buy';
}
- for $i (1 .. $form->{rowcount}) {
- map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice basefactor);
+ for my $i (1 .. $form->{rowcount}) {
+ # für bug 1284
+ 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 lastcost basefactor);
}
$form->{type} = "invoice";
# locale messages
- $locale = new Locale "$myconfig{countrycode}", "$script";
+ $main::locale = new Locale "$myconfig{countrycode}", "$script";
+ $locale = $main::locale;
require "bin/mozilla/$form->{script}";
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);
@@ -677,21 +791,26 @@ sub invoice {
prepare_invoice();
# format amounts
- for $i (1 .. $form->{rowcount}) {
+ for my $i (1 .. $form->{rowcount}) {
$form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{"discount_$i"});
- ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
+ my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
$dec = length $dec;
- $decimalplaces = ($dec > 2) ? $dec : 2;
+ my $decimalplaces = ($dec > 2) ? $dec : 2;
# copy delivery date from reqdate for order -> invoice conversion
$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"} =
@@ -701,17 +820,119 @@ sub invoice {
display_form();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
+}
+
+sub invoice_multi {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ check_do_access();
+ $main::auth->assert($form->{type} eq 'sales_delivery_order' ? 'invoice_edit' : 'vendor_invoice_edit');
+
+ my @do_ids = map { $form->{"trans_id_$_"} } grep { $form->{"multi_id_$_"} } (1..$form->{rowcount});
+
+ if (!scalar @do_ids) {
+ $form->show_generic_error($locale->text('You have not selected any delivery order.'), 'back_button' => 1);
+ }
+
+ map { delete $form->{$_} } grep { m/^(?:trans|multi)_id_\d+/ } keys %{ $form };
+
+ if (!DO->retrieve('vc' => $form->{vc}, 'ids' => \@do_ids)) {
+ $form->show_generic_error($form->{vc} eq 'customer' ?
+ $locale->text('You cannot create an invoice for delivery orders for different customers.') :
+ $locale->text('You cannot create an invoice for delivery orders from different vendors.'),
+ 'back_button' => 1);
+ }
+
+ my $source_type = $form->{type};
+ $form->{convert_from_do_ids} = join ' ', @do_ids;
+ # bei der auswahl von mehreren Lieferscheinen fuer eine Rechnung, die einfach in donumber_array
+ # zwischenspeichern (DO.pm) und als ' '-separierte Liste wieder zurueckschreiben
+ # Hinweis: delete gibt den wert zurueck und loescht danach das element (nett und einfach)
+ # $shell: perldoc perlunc; /delete EXPR
+ $form->{donumber} = delete $form->{donumber_array};
+ $form->{deliverydate} = $form->{transdate};
+ $form->{transdate} = $form->current_date(\%myconfig);
+ $form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
+ $form->{type} = "invoice";
+ $form->{closed} = 0;
+ $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
+
+ my ($script, $buysell);
+ if ($source_type eq 'purchase_delivery_order') {
+ $form->{title} = $locale->text('Add Vendor Invoice');
+ $form->{script} = 'ir.pl';
+ $script = "ir";
+ $buysell = 'sell';
+
+ } else {
+ $form->{title} = $locale->text('Add Sales Invoice');
+ $form->{script} = 'is.pl';
+ $script = "is";
+ $buysell = 'buy';
+ }
+
+ 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 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};
+
+ $locale = new Locale "$myconfig{countrycode}", "$script";
+
+ require "bin/mozilla/$form->{script}";
+
+ invoice_links();
+ prepare_invoice();
+ display_form();
+
+ $main::lxdebug->leave_sub();
}
sub save_as_new {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
+ my $form = $main::form;
+
$form->{saveasnew} = 1;
$form->{closed} = 0;
+ $form->{delivered} = 0;
map { delete $form->{$_} } qw(printed emailed queued);
+ delete @{ $form }{ grep { m/^stock_(?:in|out)_\d+/ } keys %{ $form } };
# Let Lx-Office assign a new order number if the user hasn't changed the
# previous one. If it has been changed manually then use it as-is.
@@ -723,17 +944,17 @@ sub save_as_new {
save();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub e_mail {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
check_do_access();
- $form->{print_and_save} = 1;
+ my $form = $main::form;
- $print_post = 1;
+ $form->{print_and_save} = 1;
my $saved_form = save_form();
@@ -743,19 +964,23 @@ sub e_mail {
edit_e_mail();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub calculate_stock_in_out {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
my $i = shift;
if (!$form->{"id_${i}"}) {
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return '';
}
+ my $all_units = AM->retrieve_all_units();
+
my $in_out = $form->{type} =~ /^sales/ ? 'out' : 'in';
my $sinfo = DO->unpack_stock_information('packed' => $form->{"stock_${in_out}_${i}"});
@@ -763,21 +988,23 @@ sub calculate_stock_in_out {
my $content = $form->format_amount_units('amount' => $sum * 1,
'part_unit' => $form->{"partunit_$i"},
- 'amount_unit' => $units->{$form->{"partunit_$i"}}->{base_unit},
+ 'amount_unit' => $all_units->{$form->{"partunit_$i"}}->{base_unit},
'conv_units' => 'convertible_not_smaller',
'max_places' => 2);
- $content .= qq| |;
+ $content = qq|${content} |;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
return $content;
}
sub get_basic_bin_wh_info {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my $stock_info = shift;
+ my $form = $main::form;
+
foreach my $sinfo (@{ $stock_info }) {
next unless ($sinfo->{bin_id});
@@ -785,11 +1012,13 @@ sub get_basic_bin_wh_info {
map { $sinfo->{"${_}_description"} = $sinfo->{"${_}description"} = $bin_info->{"${_}_description"} } qw(bin warehouse);
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub stock_in_out_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
if ($form->{in_out} eq 'out') {
stock_out_form();
@@ -797,14 +1026,16 @@ sub stock_in_out_form {
stock_in_form();
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub redo_stock_info {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my %params = @_;
+ my $form = $main::form;
+
my @non_empty = grep { $_->{qty} } @{ $params{stock_info} };
if ($params{add_empty_row}) {
@@ -816,53 +1047,62 @@ sub redo_stock_info {
@{ $params{stock_info} } = @non_empty;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub update_stock_in {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
my $stock_info = [];
foreach my $i (1..$form->{rowcount}) {
- push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber qty unit) };
+ $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber bestbefore qty unit) };
}
- $main::lxdebug->dump(0, "si", $stock_info);
display_stock_in_form($stock_info);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub stock_in_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
my $stock_info = DO->unpack_stock_information('packed' => $form->{stock});
display_stock_in_form($stock_info);
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub display_stock_in_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
my $stock_info = shift;
+ my $form = $main::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, "dimension");
- my $units_data = AM->unit_select_data($units, undef, undef, $part_info->{unit});
-
- my $access = $auth->check_right($form->{login}, 'all_warehouses') ? undef : $form->{login};
+ my $units = AM->retrieve_units(\%myconfig, $form);
+ # 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',
- 'access' => $access, });
+ 'bins' => 'BINS' });
- redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{closed});
+ redo_stock_info('stock_info' => $stock_info, 'add_empty_row' => !$form->{delivered});
get_basic_bin_wh_info($stock_info);
@@ -871,11 +1111,26 @@ sub display_stock_in_form {
'STOCK_INFO' => $stock_info,
'PART_INFO' => $part_info, });
- $lxdebug->leave_sub();
+ $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 {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
my $stock_info = [];
@@ -884,32 +1139,38 @@ 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');
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub stock_out_form {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
$form->{title} = $locale->text('Release From Stock');
my $part_info = IC->get_basic_part_info('id' => $form->{parts_id});
- my $units = AM->retrieve_units(\%myconfig, $form, "dimension");
+ my $units = AM->retrieve_units(\%myconfig, $form);
my $units_data = AM->unit_select_data($units, undef, undef, $part_info->{unit});
my @contents = DO->get_item_availability('parts_id' => $form->{parts_id});
my $stock_info = DO->unpack_stock_information('packed' => $form->{stock});
- if (!$form->{closed}) {
+ if (!$form->{delivered}) {
foreach my $row (@contents) {
$row->{available_qty} = $form->format_amount_units('amount' => $row->{qty} * 1,
'part_unit' => $part_info->{unit},
@@ -919,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);
}
@@ -935,14 +1197,18 @@ sub stock_out_form {
$form->header();
print $form->parse_html_template('do/stock_out_form', { 'UNITS' => $units_data,
- 'WHCONTENTS' => $form->{closed} ? $stock_info : \@contents,
+ 'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents,
'PART_INFO' => $part_info, });
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
sub set_stock_out {
- $lxdebug->enter_sub();
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
my $stock_info = [];
@@ -955,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,
@@ -972,21 +1239,33 @@ 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');
}
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
-sub transfer_in_and_close {
- $lxdebug->enter_sub();
+sub transfer_in {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ 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;
if (@part_ids) {
- my $units = AM->retrieve_units(\%myconfig, $form, "dimension");
+ my $units = AM->retrieve_units(\%myconfig, $form);
my %part_info_map = IC->get_basic_part_info('id' => \@part_ids);
my %request_map;
@@ -1009,41 +1288,52 @@ sub transfer_in_and_close {
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 closed. The warehouse contents have not changed.');
+ push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
+ set_headings('edit');
update();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
- exit 0;
+ ::end_of_request();
}
}
DO->transfer_in_out('direction' => 'in',
'requests' => \@all_requests);
- $form->{closed} = 1;
- $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;
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
-sub transfer_out_and_close {
- $lxdebug->enter_sub();
+sub transfer_out {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+
+ 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;
if (@part_ids) {
- my $units = AM->retrieve_units(\%myconfig, $form, "dimension");
+ my $units = AM->retrieve_units(\%myconfig, $form);
my %part_info_map = IC->get_basic_part_info('id' => \@part_ids);
my %request_map;
@@ -1058,8 +1348,9 @@ sub transfer_out_and_close {
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;
@@ -1071,12 +1362,12 @@ sub transfer_out_and_close {
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) {
@@ -1085,7 +1376,7 @@ sub transfer_out_and_close {
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});
@@ -1093,50 +1384,93 @@ sub transfer_out_and_close {
$request->{ok} = $request->{sum_base_qty} <= $inv->{qty};
}
- foreach $request (values %request_map) {
+ foreach my $request (values %request_map) {
next if ($request->{ok});
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 closed. The warehouse contents have not changed.');
+ push @{ $form->{ERRORS} }, $locale->text('The delivery order has not been marked as delivered. The warehouse contents have not changed.');
+ set_headings('edit');
update();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
- exit 0;
+ ::end_of_request();
}
}
-
DO->transfer_in_out('direction' => 'out',
'requests' => \@all_requests);
- $form->{closed} = 1;
- $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();
+}
+
+sub mark_closed {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ DO->close_orders('ids' => [ $form->{id} ]);
+
+ $form->{closed} = 1;
+
+ update();
- $lxdebug->leave_sub();
+ $main::lxdebug->leave_sub();
}
+
sub yes {
- call_sub($form->{yes_nextsub});
+ call_sub($main::form->{yes_nextsub});
}
sub no {
- call_sub($form->{no_nextsub});
+ call_sub($main::form->{no_nextsub});
}
sub update {
- call_sub($form->{update_nextsub} || $form->{nextsub} || 'update_delivery_order');
+ call_sub($main::form->{update_nextsub} || $main::form->{nextsub} || 'update_delivery_order');
+}
+
+sub dispatcher {
+ my $form = $main::form;
+ my $locale = $main::locale;
+
+ foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_in mark_closed save_as_new invoice delete)) {
+ if ($form->{"action_${action}"}) {
+ call_sub($action);
+ return;
+ }
+ }
+
+ $form->error($locale->text('No action defined.'));
}