X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDO.pm;h=ecaee496d85f1618bcfc76b6fc4ac3cc28033a8a;hb=b638b6a13dea5935637b3c38b1a3252053fa1a46;hp=6a9195332db9b08b8896837dde5908690da09211;hpb=0c227fb25b4f1547bf3b2be5e5711f0bffe591d1;p=kivitendo-erp.git diff --git a/SL/DO.pm b/SL/DO.pm index 6a9195332..ecaee496d 100644 --- a/SL/DO.pm +++ b/SL/DO.pm @@ -37,7 +37,6 @@ package DO; use Carp; use List::Util qw(max); use Text::ParseWords; -use YAML; use SL::AM; use SL::Common; @@ -52,6 +51,7 @@ use SL::IC; use SL::TransNumber; use SL::DB; use SL::Util qw(trim); +use SL::YAML; use strict; @@ -129,7 +129,7 @@ sub transactions { push @where, "dord.$item = ?"; push @values, conv_i($form->{$item}); } - if (!$main::auth->assert('sales_all_edit', 1)) { + if ( !(($vc eq 'customer' && $main::auth->assert('sales_all_edit', 1)) || ($vc eq 'vendor' && $main::auth->assert('purchase_all_edit', 1))) ) { push @where, qq|dord.employee_id = (select id from employee where login= ?)|; push @values, $::myconfig{login}; } @@ -450,7 +450,7 @@ SQL conv_i($sinfo->{bin_id})); $h_item_stock_id->finish(); # write back the id to the form (important if only transfer was clicked (id fk for invoice) - $form->{"stock_${in_out}_$i"} = YAML::Dump($stock_info); + $form->{"stock_${in_out}_$i"} = SL::YAML::Dump($stock_info); } @values = ($form->{"delivery_order_items_id_$i"}, $sinfo->{qty}, $sinfo->{unit}, conv_i($sinfo->{warehouse_id}), conv_i($sinfo->{bin_id}), $sinfo->{chargenumber}, conv_date($sinfo->{bestbefore}), @@ -833,7 +833,7 @@ sub retrieve { push @{ $requests }, $ref; } - $doi->{"stock_${in_out}"} = YAML::Dump($requests); + $doi->{"stock_${in_out}"} = SL::YAML::Dump($requests); } $sth->finish(); @@ -1095,7 +1095,7 @@ sub unpack_stock_information { my $unpacked; - eval { $unpacked = $params{packed} ? YAML::Load($params{packed}) : []; }; + eval { $unpacked = $params{packed} ? SL::YAML::Load($params{packed}) : []; }; $unpacked = [] if (!$unpacked || ('ARRAY' ne ref $unpacked));