From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 8 Jan 2014 10:42:41 +0000 (+0100)
Subject: Merge branch 'master' of github.com:kivitendo/kivitendo-erp
X-Git-Tag: release-3.1.0beta1~22^2~22^2~19
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/15cfd696637c6734459068dc5ff8f97b8ebe9d25?ds=inline;hp=-c

Merge branch 'master' of github.com:kivitendo/kivitendo-erp
---

15cfd696637c6734459068dc5ff8f97b8ebe9d25
diff --combined bin/mozilla/do.pl
index b0b9f62d8,0258966f0..776a99274
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@@ -38,7 -38,6 +38,7 @@@ use SL::DB::DeliveryOrder
  use SL::DO;
  use SL::IR;
  use SL::IS;
 +use SL::MoreCommon qw(ary_diff);
  use SL::ReportGenerator;
  use SL::WH;
  require "bin/mozilla/arap.pl";
@@@ -416,12 -415,6 +416,12 @@@ sub update_delivery_order 
          $form->{"sellprice_$i"}          = $form->format_amount(\%myconfig, $form->{"sellprice_$i"} * (1 - $form->{tradediscount}));
          $form->{"lastcost_$i"}          = $form->format_amount(\%myconfig, $form->{"lastcost_$i"});
          $form->{"qty_$i"}                = $form->format_amount(\%myconfig, $form->{"qty_$i"});
 +
 +        # get pricegroups for parts
 +        IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 +
 +        # build up html code for prices_$i
 +        &set_pricegroup($i);
        }
  
        display_form();
@@@ -694,8 -687,8 +694,8 @@@ sub save 
  
    $form->{simple_save} = 1;
    if (!$params{no_redirect} && !$form->{print_and_save}) {
 -    set_headings("edit");
 -    update();
 +    delete @{$form}{ary_diff([keys %{ $form }], [qw(login id script type cursor_fokus)])};
 +    edit();
      ::end_of_request();
    }
    $main::lxdebug->leave_sub();
@@@ -836,7 -829,7 +836,7 @@@ sub invoice 
      $form->{"sellprice_pg_$i"} = join '--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"};
    }
    IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 -  set_pricegroup($_) for 1 .. $form->{rowcount};
 +  set_pricegroup($form->{rowcount});
  
    display_form();
  
@@@ -1327,6 -1320,8 +1327,8 @@@ sub transfer_in 
          $request->{parts_id}  = $form->{"id_$i"};
          $row_sum_base_qty    += $request->{qty} * $units->{$request->{unit}}->{factor} / $base_unit_factor;
  
+         $request->{project_id} = $form->{"project_id_$i"} || $form->{globalproject_id};
+ 
          push @all_requests, $request;
        }