From: Jan Büren <jan@lx-office-hosting.de>
Date: Wed, 29 Dec 2010 11:40:05 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~42^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/9cba1f95c05194fe2258d44a966c2736867f26ef?hp=7dfa6eed24ec82c6891b75fee18993956a02a7b9

Merge branch 'master' of ssh://git-jbueren@lx-office.linet-services.de/~/lx-office-erp
---

diff --git a/SL/DO.pm b/SL/DO.pm
index d657cca5c..fe2318cc8 100644
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -1053,6 +1053,7 @@ sub transfer_in_out {
       'oe_id'                  => $form->{id},
       'shippingdate'           => 'current_date',
       'transfer_type'          => $params{direction} eq 'in' ? 'stock' : 'shipped',
+      'project_id'             => $request->{project_id},
     };
   }
 
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 8299a1abf..796118a12 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -1310,6 +1310,7 @@ sub transfer_out {
       foreach my $request (@{ DO->unpack_stock_information('packed' => $form->{"stock_out_$i"}) }) {
         $request->{parts_id} = $form->{"id_$i"};
         $request->{base_qty} = $request->{qty} * $units->{$request->{unit}}->{factor} / $base_unit_factor;
+        $request->{project_id} = $form->{"project_id_$i"} ? $form->{"project_id_$i"} : $form->{globalproject_id}; 
 
         my $map_key          = join '--', ($form->{"id_$i"}, @{$request}{qw(warehouse_id bin_id chargenumber bestbefore)});
 
@@ -1383,7 +1384,6 @@ sub transfer_out {
       ::end_of_request();
     }
   }
-
   DO->transfer_in_out('direction' => 'out',
                       'requests'  => \@all_requests);