InstanceConf: Funktionen get_default_(warehouse|bin)_id heißen inzwischen get_(wareho...

diff --git a/SL/InstanceConfiguration.pm b/SL/InstanceConfiguration.pm
index 68b93f713f9d2da95f1e7fe18c31428a488e2e0d..716edeed80dcb780e07f19248f3169bb45e5aecc 100644 (file)
--- 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<get_default_warehouse_id>
+=item C<get_warehouse_id>
 
 Returns the default warehouse_id
 
-=item C<get_default_bin_id>
+=item C<get_bin_id>
 
 Returns the default bin_id
 
-=item C<get_default_warehouse_id_ignore_onhand>
+=item C<get_warehouse_id_ignore_onhand>
 
 Returns the default warehouse_id for transfers without checking the
 current stock quantity
 
-=item C<get_default_bin_id_ignore_onhand>
+=item C<get_bin_id_ignore_onhand>
 
 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 d6a51bc15447882d7f68fba17aaf8c3749562bc7..df2fec8d7d18be5128e4bfbe8173a23f6cb7f248 100644 (file)
--- 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 c68fef0cafc023a01b90db371b4ea7614cf77f1a..3434861c128366af5604344e5d3912f3a54f21c5 100644 (file)
--- 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};