Einkaufspreis bei Einkaufsauftrag aus Verkaufsauftrag

Generiert man im Workflow aus einem Kundenauftrag einen Lieferantenauftrag so sollte als Verkaufspreis nicht der Verkaufspreis aus dem Verkaufsauftrag sondern der Einkaufspreis für die Waren in der Maske gesetzt werden.

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 9cc570ace09482ffa3cc9f9e129bfcffb4cb9772..d8f4415a4fb606708eaf0306b1cc0e60ea90a6dc 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -1688,7 +1688,9 @@ sub purchase_order {
   check_oe_access();
   $main::auth->assert('purchase_order_edit');
 
   check_oe_access();
   $main::auth->assert('purchase_order_edit');
 

+  $form->{sales_order_to_purchase_order} = 0;

   if ($form->{type} eq 'sales_order') {
   if ($form->{type} eq 'sales_order') {

+    $form->{sales_order_to_purchase_order} = 1;

     check_for_direct_delivery();
   }
 
     check_for_direct_delivery();
   }
 


@@ -1706,6 +1708,8 @@ sub purchase_order {
 
   &poso;
 
 
   &poso;
 

+  delete $form->{sales_order_to_purchase_order};
+

   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 


@@ -1754,8 +1758,14 @@ sub poso {
   $form->{old_salesman_id}     = $form->{salesman_id};
 
   # reset
   $form->{old_salesman_id}     = $form->{salesman_id};
 
   # reset

-  map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered
-                                ordnumber);
+  map { delete $form->{$_} } qw(id subject message cc bcc printed emailed queued customer vendor creditlimit creditremaining discount tradediscount oldinvtotal delivered ordnumber);
+
+  # if purchase_order was generated from sales_order, use lastcost_$i as sellprice_$i
+  if ( $form->{sales_order_to_purchase_order} ) {
+    for my $i (1 .. $form->{rowcount}) {
+      $form->{"sellprice_${i}"} = $form->parse_amount(\%myconfig, $form->{"lastcost_${i}"});
+    };
+  };

 
   for my $i (1 .. $form->{rowcount}) {
     map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor discount);
 
   for my $i (1 .. $form->{rowcount}) {
     map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if ($form->{"${_}_${i}"}) } qw(ship qty sellprice listprice basefactor discount);