X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDO.pm;h=ebc60515978d526100e106d47b509f544ef8dc49;hb=75f7cc1dab30b70f9f1044a1ef3d8a924bf35c34;hp=14d61a1d4d2dcd6d1105e6e4445de791d10e097a;hpb=092d31105afe7d3dd180502fec1272df07713815;p=kivitendo-erp.git diff --git a/SL/DO.pm b/SL/DO.pm index 14d61a1d4..ebc605159 100644 --- a/SL/DO.pm +++ b/SL/DO.pm @@ -134,7 +134,8 @@ sub transactions { push @where, "dord.$item = ?"; push @values, conv_i($form->{$item}); } - if ( !(($vc eq 'customer' && $main::auth->assert('sales_all_edit', 1)) || ($vc eq 'vendor' && $main::auth->assert('purchase_all_edit', 1))) ) { + if ( !( ($vc eq 'customer' && ($main::auth->assert('sales_all_edit', 1) || $main::auth->assert('sales_delivery_order_view', 1))) + || ($vc eq 'vendor' && ($main::auth->assert('purchase_all_edit', 1) || $main::auth->assert('purchase_delivery_order_view', 1))) ) ) { push @where, qq|dord.employee_id = (select id from employee where login= ?)|; push @values, $::myconfig{login}; } @@ -333,8 +334,8 @@ sub _save { $query = qq|SELECT nextval('id')|; ($form->{id}) = selectrow_query($form, $dbh, $query); - $query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id, taxzone_id) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1), ?)|; - do_query($form, $dbh, $query, $form->{id}, conv_i($form->{employee_id}), $form->{taxzone_id}); + $query = qq|INSERT INTO delivery_orders (id, donumber, employee_id, currency_id, taxzone_id, order_type) VALUES (?, '', ?, (SELECT currency_id FROM defaults LIMIT 1), ?, ?)|; + do_query($form, $dbh, $query, $form->{id}, conv_i($form->{employee_id}), $form->{taxzone_id}, SALES_DELIVERY_ORDER_TYPE); } my $project_id;