X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fdo.pl;h=06b8f65524b87751149f29aadbb5e6801d7ba0c1;hb=e86e30de944c4bbe4b42f43d933e0a28a83408dd;hp=37353dccabc536427219f8d5963db355658965aa;hpb=5bafcdd75fe8da638a141cfd42e3cd450a675cd2;p=kivitendo-erp.git
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 37353dcca..06b8f6552 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -38,6 +38,7 @@ use SL::DB::DeliveryOrder;
use SL::DO;
use SL::IR;
use SL::IS;
+use SL::MoreCommon qw(ary_diff);
use SL::ReportGenerator;
use SL::WH;
require "bin/mozilla/arap.pl";
@@ -165,15 +166,14 @@ sub order_links {
$form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
# retrieve order/quotation
- $form->{webdav} = $::lx_office_conf{features}->{webdav};
- $form->{jsscript} = 1;
+ $form->{webdav} = $::instance_conf->get_webdav;
my $editing = $form->{id};
DO->retrieve('vc' => $form->{vc},
'ids' => $form->{id});
- $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes currency));
+ $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes delivery_term_id currency));
$form->{shipto} = 1 if $form->{id} || $form->{convert_from_oe_ids};
# get customer / vendor
@@ -185,7 +185,7 @@ sub order_links {
$form->{discount} = $form->{customer_discount};
}
- $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id));
+ $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id delivery_term_id));
$form->restore_vars(qw(currency)) if ($form->{id} || $form->{convert_from_oe_ids});
$form->restore_vars(qw(taxincluded)) if $form->{id};
$form->restore_vars(qw(salesman_id)) if $editing;
@@ -255,32 +255,37 @@ sub form_header {
$form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
$form->{salesman_id} = $form->{old_salesman_id} if $form->{old_salesman_id};
- # use JavaScript Calendar or not
- $form->{jsscript} = 1;
-
- #write Trigger
- 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_$_"})
if ($form->{"project_id_$_"}); } (1..$form->{"rowcount"}));
my $vc = $form->{vc} eq "customer" ? "customers" : "vendors";
- $form->get_lists("contacts" => "ALL_CONTACTS",
- "shipto" => "ALL_SHIPTO",
- "projects" => {
+ $form->get_lists("projects" => {
"key" => "ALL_PROJECTS",
"all" => 0,
"old_id" => \@old_project_ids
},
- "employees" => "ALL_EMPLOYEES",
- "salesmen" => "ALL_SALESMEN",
$vc => "ALL_VC",
"price_factors" => "ALL_PRICE_FACTORS",
"departments" => "ALL_DEPARTMENTS",
"business_types" => "ALL_BUSINESS_TYPES",
);
+ $::form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{employee_id}, deleted => 0 ] ]);
+ $::form->{ALL_SALESMEN} = SL::DB::Manager::Employee->get_all_sorted(query => [ or => [ id => $::form->{salesman_id}, deleted => 0 ] ]);
+ $::form->{ALL_SHIPTO} = SL::DB::Manager::Shipto->get_all_sorted(query => [
+ or => [ trans_id => $::form->{"$::form->{vc}_id"} * 1, and => [ shipto_id => $::form->{shipto_id} * 1, trans_id => undef ] ]
+ ]);
+ $::form->{ALL_CONTACTS} = SL::DB::Manager::Contact->get_all_sorted(query => [
+ or => [
+ cp_cv_id => $::form->{"$::form->{vc}_id"} * 1,
+ and => [
+ cp_cv_id => undef,
+ cp_id => $::form->{cp_id} * 1
+ ]
+ ]
+ ]);
+
map { $_->{value} = "$_->{description}--$_->{id}" } @{ $form->{ALL_DEPARTMENTS} };
map { $_->{value} = "$_->{name}--$_->{id}" } @{ $form->{ALL_VC} };
@@ -289,15 +294,23 @@ sub form_header {
$form->{oldvcname} = $form->{"old$form->{vc}"};
$form->{oldvcname} =~ s/--.*//;
- $form->{onload} = "";
- if ($form->{resubmit}) {
- if ($form->{format} eq "html") {
- $form->{onload} = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
- }
+ my $dispatch_to_popup = '';
+ if ($form->{resubmit} && ($form->{format} eq "html")) {
+ $dispatch_to_popup = "window.open('about:blank','Beleg'); document.do.target = 'Beleg';";
+ $dispatch_to_popup .= "document.do.submit();";
+ } elsif ($form->{resubmit}) {
# emulate click for resubmitting actions
- $form->{onload} .= "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
- $form->{onload} .= "document.do.submit();"
+ $dispatch_to_popup = "document.do.${_}.click(); " for grep { /^action_/ } keys %$form;
}
+ $::request->{layout}->add_javascripts_inline("\$(function(){$dispatch_to_popup});");
+
+
+ my $follow_up_vc = $form->{ $form->{vc} eq 'customer' ? 'customer' : 'vendor' };
+ $follow_up_vc =~ s/--\d*\s*$//;
+
+ $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')';
+
+ $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase));
$form->header();
# Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID'
@@ -325,8 +338,10 @@ sub form_footer {
my $form = $main::form;
$form->{PRINT_OPTIONS} = print_options('inline' => 1);
+ $form->{ALL_DELIVERY_TERMS} = SL::DB::Manager::DeliveryTerm->get_all_sorted();
- print $form->parse_html_template('do/form_footer');
+ print $form->parse_html_template('do/form_footer',
+ {transfer_default => ($::instance_conf->get_transfer_default)});
$main::lxdebug->leave_sub();
}
@@ -385,7 +400,10 @@ sub update_delivery_order {
my $rows = scalar @{ $form->{item_list} };
if ($rows) {
- $form->{"qty_$i"} = 1 unless $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
+ if( !$form->{"qty_$i"} ) {
+ $form->{"qty_$i"} = 1;
+ }
if ($rows > 1) {
@@ -397,9 +415,15 @@ sub update_delivery_order {
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->{"sellprice_$i"} = $form->format_amount(\%myconfig, $form->{"sellprice_$i"} * (1 - $form->{tradediscount}));
$form->{"lastcost_$i"} = $form->format_amount(\%myconfig, $form->{"lastcost_$i"});
$form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
+
+ # get pricegroups for parts
+ IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+ # build up html code for prices_$i
+ &set_pricegroup($i);
}
display_form();
@@ -440,12 +464,11 @@ sub search {
$form->get_lists("projects" => { "key" => "ALL_PROJECTS",
"all" => 1 },
- "employees" => "ALL_EMPLOYEES",
- "salesmen" => "ALL_SALESMEN",
+ "departments" => "ALL_DEPARTMENTS",
"$form->{vc}s" => "ALL_VC");
+ $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);
$form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };
- $form->{jsscript} = 1;
$form->{title} = $locale->text('Delivery Orders');
$form->header();
@@ -465,6 +488,7 @@ sub orders {
my $locale = $main::locale;
my $cgi = $::request->{cgi};
+ $form->{department_id} = (split /--/, $form->{department})[-1];
($form->{ $form->{vc} }, $form->{"$form->{vc}_id"}) = split(/--/, $form->{ $form->{vc} });
report_generator_set_default_sort('transdate', 1);
@@ -474,12 +498,12 @@ sub orders {
$form->{rowcount} = scalar @{ $form->{DO} };
my @columns = qw(
- ids transdate
+ ids transdate reqdate
id donumber
- ordnumber
+ ordnumber customernumber cusordnumber
name employee salesman
shipvia globalprojectnumber
- transaction_description
+ transaction_description department
open delivered
);
@@ -493,17 +517,21 @@ sub orders {
my $report = SL::ReportGenerator->new(\%myconfig, $form);
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 project_id);
+ push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber
+ transaction_description transdatefrom transdateto reqdatefrom reqdateto
+ type vc employee_id salesman_id project_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
my %column_defs = (
'ids' => { 'text' => '', },
- 'transdate' => { 'text' => $locale->text('Date'), },
+ 'transdate' => { 'text' => $locale->text('Delivery Order Date'), },
+ 'reqdate' => { 'text' => $locale->text('Reqdate'), },
'id' => { 'text' => $locale->text('ID'), },
'donumber' => { 'text' => $locale->text('Delivery Order'), },
'ordnumber' => { 'text' => $locale->text('Order'), },
+ 'customernumber' => { 'text' => $locale->text('Customer Number'), },
+ 'cusordnumber' => { 'text' => $locale->text('Customer Order Number'), },
'name' => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
'employee' => { 'text' => $locale->text('Employee'), },
'salesman' => { 'text' => $locale->text('Salesman'), },
@@ -512,9 +540,10 @@ sub orders {
'transaction_description' => { 'text' => $locale->text('Transaction description'), },
'open' => { 'text' => $locale->text('Open'), },
'delivered' => { 'text' => $locale->text('Delivered'), },
+ 'department' => { 'text' => $locale->text('Department'), },
);
- foreach my $name (qw(id transdate donumber ordnumber name employee salesman shipvia transaction_description)) {
+ foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department)) {
my $sortdir = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
$column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
}
@@ -548,15 +577,20 @@ sub orders {
if ($form->{ordnumber}) {
push @options, $locale->text('Order Number') . " : $form->{ordnumber}";
}
+ push @options, $locale->text('Serial Number') . " : $form->{serialnumber}" if $form->{serialnumber};
if ($form->{transaction_description}) {
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
}
- if ($form->{transdatefrom}) {
- 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);
- }
+ if ( $form->{transdatefrom} or $form->{transdateto} ) {
+ push @options, $locale->text('Delivery Order Date');
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if $form->{transdateto};
+ };
+ if ( $form->{reqdatefrom} or $form->{reqdateto} ) {
+ push @options, $locale->text('Reqdate');
+ push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1) if $form->{reqdatefrom};
+ push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{reqdateto}, 1) if $form->{reqdateto};
+ };
if ($form->{open}) {
push @options, $locale->text('Open');
}
@@ -605,8 +639,7 @@ sub orders {
};
$row->{donumber}->{link} = $edit_url . "&id=" . E($dord->{id}) . "&callback=${callback}";
- $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}";
-
+ $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id}) . "&callback=${callback}" if $dord->{oe_id};
$report->add_data($row);
$idx++;
@@ -651,17 +684,7 @@ sub save {
}
$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}) {
@@ -673,8 +696,8 @@ sub save {
$form->{simple_save} = 1;
if (!$params{no_redirect} && !$form->{print_and_save}) {
- set_headings("edit");
- update();
+ delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
+ edit();
::end_of_request();
}
$main::lxdebug->leave_sub();
@@ -685,25 +708,6 @@ sub delete {
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 };
-
- $form->{title} = $locale->text('Delete delivery order');
- $form->header();
-
- print $form->parse_html_template('do/delete', { 'VARIABLES' => \@variables });
-
- $main::lxdebug->leave_sub();
-}
-
-sub delete_delivery_order {
- $main::lxdebug->enter_sub();
-
- check_do_access();
-
my $form = $main::form;
my %myconfig = %main::myconfig;
my $locale = $main::locale;
@@ -771,6 +775,7 @@ sub invoice {
}
}
map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice lastcost basefactor);
+ $form->{"donumber_$i"} = $form->{donumber};
}
$form->{type} = "invoice";
@@ -831,10 +836,10 @@ sub invoice {
# show pricegroup in newly loaded invoice when creating invoice from delivery order
for my $i (1 .. $form->{rowcount}) {
- $form->{"sellprice_pg_$i"} = join /--/, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
+ $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
}
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
- set_pricegroup($_) for 1 .. $form->{rowcount};
+ set_pricegroup($form->{rowcount});
display_form();
@@ -873,6 +878,8 @@ sub invoice_multi {
# 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->{ordnumber} = delete $form->{ordnumber_array};
+ $form->{cusordnumber} = delete $form->{cusordnumber_array};
$form->{deliverydate} = $form->{transdate};
$form->{transdate} = $form->current_date(\%myconfig);
$form->{duedate} = $form->current_date(\%myconfig, $form->{invdate}, $form->{terms} * 1);
@@ -937,7 +944,7 @@ sub invoice_multi {
# show pricegroup in newly loaded invoice when creating invoice from delivery order
for my $i (1 .. $form->{rowcount}) {
- $form->{"sellprice_pg_$i"} = join /--/, $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
+ $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
}
IS->get_pricegroups_for_parts(\%myconfig, \%$form);
set_pricegroup($_) for 1 .. $form->{rowcount};
@@ -960,7 +967,7 @@ sub save_as_new {
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
+ # Let kivitendo 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.
$form->{donumber} =~ s/^\s*//g;
$form->{donumber} =~ s/\s*$//g;
@@ -1117,12 +1124,16 @@ 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});
+ # Standardlagerplatz für Standard-Auslagern verwenden, falls keiner für die Ware explizit definiert wurde
+ if ($::instance_conf->get_transfer_default_use_master_default_bin) {
+ $part_info->{warehouse_id} ||= $::instance_conf->get_warehouse_id;
+ $part_info->{bin_id} ||= $::instance_conf->get_bin_id;
+ }
+
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});
@@ -1134,7 +1145,7 @@ sub display_stock_in_form {
get_basic_bin_wh_info($stock_info);
- $form->header();
+ $form->header(no_layout => 1);
print $form->parse_html_template('do/stock_in_form', { 'UNITS' => $units_data,
'STOCK_INFO' => $stock_info,
'PART_INFO' => $part_info, });
@@ -1228,7 +1239,7 @@ sub stock_out_form {
}
}
- $form->header();
+ $form->header(no_layout => 1);
print $form->parse_html_template('do/stock_out_form', { 'UNITS' => $units_data,
'WHCONTENTS' => $form->{delivered} ? $stock_info : \@contents,
'PART_INFO' => $part_info, });
@@ -1319,6 +1330,8 @@ sub transfer_in {
$request->{parts_id} = $form->{"id_$i"};
$row_sum_base_qty += $request->{qty} * $units->{$request->{unit}}->{factor} / $base_unit_factor;
+ $request->{project_id} = $form->{"project_id_$i"} || $form->{globalproject_id};
+
push @all_requests, $request;
}
@@ -1428,7 +1441,7 @@ sub transfer_out {
my $pinfo = $part_info_map{$request->{parts_id}};
my $binfo = $bin_info_map{$request->{bin_id}};
- if ($::lx_office_conf{features}->{show_best_before}) {
+ if ($::instance_conf->get_show_bestbefore) {
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},
@@ -1503,7 +1516,8 @@ 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)) {
+ foreach my $action (qw(update ship_to print e_mail save transfer_out transfer_out_default
+ transfer_in transfer_in_default mark_closed save_as_new invoice delete)) {
if ($form->{"action_${action}"}) {
call_sub($action);
return;
@@ -1512,3 +1526,164 @@ sub dispatcher {
$form->error($locale->text('No action defined.'));
}
+
+sub transfer_out_default {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ transfer_in_out_default('direction' => 'out');
+
+ $main::lxdebug->leave_sub();
+}
+
+sub transfer_in_default {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+
+ transfer_in_out_default('direction' => 'in');
+
+ $main::lxdebug->leave_sub();
+}
+
+# Falls das Standardlagerverfahren aktiv ist, wird
+# geprüft, ob alle Standardlagerplätze für die Auslager-
+# artikel vorhanden sind UND ob die Warenmenge ausreicht zum
+# Auslagern. Falls nicht wird entsprechend eine Fehlermeldung
+# generiert. Offen Chargennummer / bestbefore wird nicht berücksichtigt
+sub transfer_in_out_default {
+ $main::lxdebug->enter_sub();
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ my $locale = $main::locale;
+ my %params = @_;
+
+ my (%missing_default_bins, %qty_parts, @all_requests, %part_info_map, $default_warehouse_id, $default_bin_id);
+
+ Common::check_params(\%params, qw(direction));
+
+ # entsprechende defaults holen, falls standardlagerplatz verwendet werden soll
+ if ($::instance_conf->get_transfer_default_use_master_default_bin) {
+ $default_warehouse_id = $::instance_conf->get_warehouse_id;
+ $default_bin_id = $::instance_conf->get_bin_id;
+ }
+
+
+ my @part_ids = map { $form->{"id_${_}"} } (1 .. $form->{rowcount});
+ if (@part_ids) {
+ my $units = AM->retrieve_units(\%myconfig, $form);
+ %part_info_map = IC->get_basic_part_info('id' => \@part_ids);
+ foreach my $i (1 .. $form->{rowcount}) {
+ next unless ($form->{"id_$i"});
+ my $base_unit_factor = $units->{ $part_info_map{$form->{"id_$i"}}->{unit} }->{factor} || 1;
+ my $qty = $form->parse_amount(\%myconfig, $form->{"qty_$i"}) * $units->{$form->{"unit_$i"}}->{factor} / $base_unit_factor;
+ $qty_parts{$form->{"id_$i"}} += $qty;
+
+
+ $part_info_map{$form->{"id_$i"}}{bin_id} ||= $default_bin_id;
+ $part_info_map{$form->{"id_$i"}}{warehouse_id} ||= $default_warehouse_id;
+
+ push @all_requests, {
+ 'chargenumber' => '', #?? die müsste entsprechend geholt werden
+ #'bestbefore' => undef, # TODO wird nicht berücksichtigt
+ 'bin_id' => $part_info_map{$form->{"id_$i"}}{bin_id},
+ 'qty' => $qty,
+ 'parts_id' => $form->{"id_$i"},
+ 'comment' => 'Default transfer DO',
+ 'ok' => 1,
+ 'unit' => $part_info_map{$form->{"id_$i"}}{unit},
+ 'warehouse_id' => $part_info_map{$form->{"id_$i"}}{warehouse_id},
+ 'oe_id' => $form->{id},
+ 'project_id' => $form->{"project_id_$i"} ? $form->{"project_id_$i"} : $form->{globalproject_id}
+ };
+ }
+
+ # jetzt wird erst überprüft, ob die Stückzahl entsprechend stimmt.
+ if ($params{direction} eq 'out') { # wird nur für ausgehende Mengen benötigit
+ foreach my $key (keys %qty_parts) {
+
+ $missing_default_bins{$key}{missing_bin} = 1 unless ($part_info_map{$key}{bin_id});
+ next unless ($part_info_map{$key}{bin_id}); # abbruch
+
+ my ($max_qty, $error) = WH->get_max_qty_parts_bin(parts_id => $key, bin_id => $part_info_map{$key}{bin_id});
+ if ($error == 1) {
+ # wir können nicht entscheiden, welche charge oder mhd (bestbefore) ausgewählt sein soll
+ # deshalb rückmeldung nach oben geben, manuell auszulagern
+ # TODO Bei nur einem Treffer mit Charge oder bestbefore wäre das noch möglich
+ $missing_default_bins{$key}{chargenumber} = 1;
+ }
+ if ($max_qty < $qty_parts{$key}){
+ $missing_default_bins{$key}{missing_qty} = $max_qty - $qty_parts{$key};
+ }
+ }
+ }
+ } # if @parts_id
+
+ # Abfrage für Fehlerbehandlung (nur bei direction == out)
+ if (scalar (keys %missing_default_bins)) {
+ my $fehlertext;
+ foreach my $fehler (keys %missing_default_bins) {
+
+ my $ware = WH->get_part_description(parts_id => $fehler);
+ if ($missing_default_bins{$fehler}{missing_bin}){
+ $fehlertext .= "Kein Standardlagerplatz definiert bei $ware
";
+ }
+ if ($missing_default_bins{$fehler}{missing_qty}) { # missing_qty
+ $fehlertext .= "Es fehlen " . $missing_default_bins{$fehler}{missing_qty}*-1 .
+ " von $ware auf dem Standard-Lagerplatz " . $part_info_map{$fehler}{bin} . " zum Auslagern
";
+ }
+ if ($missing_default_bins{$fehler}{chargenumber}){
+ $fehlertext .= "Die Ware hat eine Chargennummer oder eine Mindesthaltbarkeit definiert.
+ Hier kann man nicht automatisch entscheiden.
+ Bitte diesen Lieferschein manuell auslagern.
+ Bei: $ware";
+ }
+ # auslagern soll immer gehen, auch wenn nicht genügend auf lager ist.
+ # der lagerplatz ist hier extra konfigurierbar, bspw. Lager-Korrektur mit
+ # Lagerplatz Lagerplatz-Korrektur
+ my $default_warehouse_id_ignore_onhand = $::instance_conf->get_warehouse_id_ignore_onhand;
+ my $default_bin_id_ignore_onhand = $::instance_conf->get_bin_id_ignore_onhand;
+ if ($::instance_conf->get_transfer_default_ignore_onhand && $default_bin_id_ignore_onhand) {
+ # entsprechende defaults holen
+ # falls chargenumber, bestbefore oder anzahl nicht stimmt, auf automatischen
+ # lagerplatz wegbuchen!
+ foreach (@all_requests) {
+ if ($_->{parts_id} eq $fehler){
+ $_->{bin_id} = $default_bin_id_ignore_onhand;
+ $_->{warehouse_id} = $default_warehouse_id_ignore_onhand;
+ }
+ }
+ } else {
+ #$main::lxdebug->message(0, 'Fehlertext: ' . $fehlertext);
+ $form->show_generic_error($locale->text("Cannot transfer.
Reason:
#1", $fehlertext ), 'back_button' => 1);
+ }
+ }
+ }
+
+
+ # hier der eigentliche fallunterschied für in oder out
+ my $prefix = $params{direction} eq 'in' ? 'in' : 'out';
+
+ # dieser array_ref ist für DO->save da:
+ # einmal die all_requests in YAML verwandeln, damit delivery_order_items_stock
+ # gefüllt werden kann.
+ my $i = 1;
+ foreach (@all_requests){
+ $form->{"stock_${prefix}_$i"} = YAML::Dump([$_]);
+ $i++;
+ }
+
+ save(no_redirect => 1); # Wir können auslagern, deshalb beleg speichern
+ # und in delivery_order_items_stock speichern
+ DO->transfer_in_out('direction' => $prefix,
+ 'requests' => \@all_requests);
+
+ SL::DB::DeliveryOrder->new(id => $form->{id})->load->update_attributes(delivered => 1);
+
+ $form->{callback} = 'do.pl?action=edit&type=sales_delivery_order&id=' . $form->escape($form->{id}) if $params{direction} eq 'out';
+ $form->{callback} = 'do.pl?action=edit&type=purchase_delivery_order&id=' . $form->escape($form->{id}) if $params{direction} eq 'in';
+ $form->redirect;
+
+}