From ed023e22a9d47de1be5e7ebaf86885044e25b6ae Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 5 Jul 2013 10:56:21 +0200 Subject: [PATCH] =?utf8?q?InstanceConf:=20Funktionen=20get=5Fdefault=5F(wa?= =?utf8?q?rehouse|bin)=5Fid=20hei=C3=9Fen=20inzwischen=20get=5F(warehouse|?= =?utf8?q?bin)=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/InstanceConfiguration.pm | 8 ++++---- bin/mozilla/do.pl | 12 ++++++------ bin/mozilla/ic.pl | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/SL/InstanceConfiguration.pm b/SL/InstanceConfiguration.pm index 68b93f713..716edeed8 100644 --- a/SL/InstanceConfiguration.pm +++ b/SL/InstanceConfiguration.pm @@ -168,20 +168,20 @@ corresponding record type (true or false). Returns the default behavior for showing the delete button for the corresponding record type (true or false). -=item C +=item C Returns the default warehouse_id -=item C +=item C Returns the default bin_id -=item C +=item C Returns the default warehouse_id for transfers without checking the current stock quantity -=item C +=item C Returns the default bin_id for transfers without checking the. current stock quantity diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index d6a51bc15..df2fec8d7 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -1126,8 +1126,8 @@ sub display_stock_in_form { # 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_default_warehouse_id; - $part_info->{bin_id} ||= $::instance_conf->get_default_bin_id; + $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); @@ -1560,8 +1560,8 @@ sub transfer_in_out_default { # entsprechende defaults holen, falls standardlagerplatz verwendet werden soll if ($::instance_conf->get_transfer_default_use_master_default_bin) { - $default_warehouse_id = $::instance_conf->get_default_warehouse_id; - $default_bin_id = $::instance_conf->get_default_bin_id; + $default_warehouse_id = $::instance_conf->get_warehouse_id; + $default_bin_id = $::instance_conf->get_bin_id; } @@ -1637,8 +1637,8 @@ sub transfer_in_out_default { # 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_default_warehouse_id_ignore_onhand; - my $default_bin_id_ignore_onhand = $::instance_conf->get_default_bin_id_ignore_onhand; + 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 diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index c68fef0ca..3434861c1 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -1593,8 +1593,8 @@ sub form_header { if (my $max = scalar @{ $form->{WAREHOUSES} }) { my ($default_warehouse_id, $default_bin_id); if ($form->{action} eq 'add') { # default only for new entries - $default_warehouse_id = $::instance_conf->get_default_warehouse_id; - $default_bin_id = $::instance_conf->get_default_bin_id; + $default_warehouse_id = $::instance_conf->get_warehouse_id; + $default_bin_id = $::instance_conf->get_bin_id; } $form->{warehouse_id} ||= $default_warehouse_id || $form->{WAREHOUSES}->[$max -1]->{id}; $form->{bin_id} ||= $default_bin_id || $form->{WAREHOUSES}->[$max -1]->{BINS}->[0]->{id}; -- 2.20.1