Bei Lieferscheinen muss der Preisfaktor versteckt mitgeschleift werden.

[kivitendo-erp.git] / bin / mozilla / io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 081bc3f610566d64b724f7777bc5fc529980a5e3..e66c7350674c7bd2c3fe52af7b58903d8184ac60 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -128,7 +128,7 @@ sub display_row {
     {  id => 'ship',          width => 5,     value => ($form->{type} eq 'purchase_order' ? $locale->text('Ship rcvd') : $locale->text('Ship')),                 
        display => $form->{type} =~ /sales_order/ || ($form->{type} =~ /purchase_order/ && !($lizenzen && $form->{vc} eq "customer")) , },
     {  id => 'qty',           width => 5,     value => $locale->text('Qty'),                  display => 1, },
-    {  id => 'price_factor',  width => 5,     value => $locale->text('Price Factor'),         display => 1, },
+    {  id => 'price_factor',  width => 5,     value => $locale->text('Price Factor'),         display => !$is_delivery_order, },
     {  id => 'unit',          width => 5,     value => $locale->text('Unit'),                 display => 1, },
     {  id => 'license',       width => 10,    value => $locale->text('License'),              display => 0, },
     {  id => 'serialnr',      width => 10,    value => $locale->text('Serial No.'),           display => 0, },
@@ -327,7 +327,7 @@ sub display_row {
 
     if ($is_delivery_order) {
       map { $form->{"${_}_${i}"} = $form->format_amount(\%myconfig, $form->{"${_}_${i}"}) } qw(sellprice discount);
-      push @hidden_vars, qw(sellprice discount);
+      push @hidden_vars, qw(sellprice discount price_factor_id);
       push @hidden_vars, "stock_${stock_in_out}_sum_qty", "stock_${stock_in_out}";
     }
 
@@ -1141,9 +1141,9 @@ sub print_options {
 sub print {
   $lxdebug->enter_sub();
 
-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit | ' .
-                'order_request_edit_all     | order_request_edit');
+  $auth->assert('part_service_assembly_edit   | vendor_invoice_edit       | sales_order_edit    | invoice_edit |' .
+                'request_quotation_edit       | sales_quotation_edit      | purchase_order_edit | ' .
+                'purchase_delivery_order_edit | sales_delivery_order_edit');
 
   if ($form->{print_nextsub}) {
     call_sub($form->{print_nextsub});
@@ -1377,13 +1377,7 @@ sub print_form {
   ($form->{employee}) = split /--/, $form->{employee};
 
   # create the form variables
-  if ($form->{formname} eq 'order_request') {
-    order_request_details();
-  } elsif ($form->{formname} eq 'return_material_slip') {
-    rms_details();
-  } elsif ($form->{formname} eq 'release_material_slip') {
-    rlms_details();
-  } elsif ($form->{type} =~ /_delivery_order$/) {
+  if ($form->{type} =~ /_delivery_order$/) {
     DO->order_details();
   } elsif ($order) {
     OE->order_details(\%myconfig, \%$form);