projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get_models callback entefrnt und in den finalize prozess integriert
[kivitendo-erp.git]
/
SL
/
Controller
/
Inventory.pm
diff --git
a/SL/Controller/Inventory.pm
b/SL/Controller/Inventory.pm
index
88c24fb
..
f3f2938
100644
(file)
--- a/
SL/Controller/Inventory.pm
+++ b/
SL/Controller/Inventory.pm
@@
-58,6
+58,7
@@
sub action_stock {
});
if ($::form->{write_default_bin}) {
});
if ($::form->{write_default_bin}) {
+ $self->part->load; # onhand is calculated in between. don't mess that up
$self->part->bin($self->bin);
$self->part->warehouse($self->warehouse);
$self->part->save;
$self->part->bin($self->bin);
$self->part->warehouse($self->warehouse);
$self->part->save;
@@
-71,6
+72,7
@@
sub action_stock {
part_id => $self->part->id,
bin_id => $self->bin->id,
warehouse_id => $self->warehouse->id,
part_id => $self->part->id,
bin_id => $self->bin->id,
warehouse_id => $self->warehouse->id,
+ unit_id => $self->unit->id,
);
}
);
}
@@
-121,7
+123,7
@@
sub _check_warehouses {
}
sub init_warehouses {
}
sub init_warehouses {
- SL::DB::Manager::Warehouse->get_all;
+ SL::DB::Manager::Warehouse->get_all
(query => [ or => [ invalid => 0, invalid => undef ]])
;
}
sub init_units {
}
sub init_units {
@@
-148,8
+150,8
@@
sub set_target_from_part {
sub sanitize_target {
my ($self) = @_;
sub sanitize_target {
my ($self) = @_;
- $self->warehouse(
SL::DB::Manager::Warehouse->get_first)
if !$self->warehouse || !$self->warehouse->id;
- $self->bin ($self->warehouse->bins->[0])
if !$self->bin || !$self->bin->id;
+ $self->warehouse(
$self->warehouses->[0])
if !$self->warehouse || !$self->warehouse->id;
+ $self->bin ($self->warehouse->bins->[0]) if !$self->bin || !$self->bin->id;
}
sub load_part_from_form {
}
sub load_part_from_form {
@@
-229,7
+231,7
@@
sub mini_stock {
$self->{stock_empty} = ! grep { $_->{sum} * 1 } @$stock;
}
$self->{stock_empty} = ! grep { $_->{sum} * 1 } @$stock;
}
-sub show_no_warehouse_error {
+sub show_no_warehouse
s
_error {
my ($self) = @_;
my $msg = t8('No warehouse has been created yet or the quantity of the bins is not configured yet.') . ' ';
my ($self) = @_;
my $msg = t8('No warehouse has been created yet or the quantity of the bins is not configured yet.') . ' ';