Merge branch 'transnumbergenerator-anstelle-von-update-defaults-2010'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 8 Jan 2014 12:20:10 +0000 (13:20 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 8 Jan 2014 12:20:10 +0000 (13:20 +0100)
Behebt #2010.

1  2 
bin/mozilla/io.pl

diff --combined bin/mozilla/io.pl
@@@ -225,10 -225,6 +225,10 @@@ sub display_row 
        qw(qty discount sellprice lastcost price_new price_old)
          unless ($form->{simple_save});
  
 +    if ($form->{"prices_$i"} && ($form->{"new_pricegroup_$i"} != $form->{"old_pricegroup_$i"})) {
 +      $form->{"sellprice_$i"} = $form->{"price_new_$i"};
 +    }
 +
  # unit begin
      $form->{"unit_old_$i"}      ||= $form->{"unit_$i"};
      $form->{"selected_unit_$i"} ||= $form->{"unit_$i"};
@@@ -1346,31 -1342,7 +1346,7 @@@ sub print_form 
    # $locale->text('Quotation Number missing!')
    # $locale->text('Quotation Date missing!')
  
-   # assign number
    $form->{what_done} = $form->{formname};
-   if (!$form->{"${inv}number"} && !$form->{preview} && !$form->{id}) {
-     $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
-     if ($form->{media} ne 'email') {
-       # get pricegroups for parts
-       IS->get_pricegroups_for_parts(\%myconfig, \%$form);
-       # build up html code for prices_$i
-       set_pricegroup($form->{rowcount});
-       $form->{rowcount}--;
-       call_sub($display_form);
-       # saving the history
-       if(!exists $form->{addition}) {
-         $form->{snumbers} = "${inv}number" . "_" . $form->{"${inv}number"};
-         $form->{addition} = "PRINTED";
-         $form->save_history;
-       }
-       # /saving the history
-       ::end_of_request();
-     }
-   }
  
    &validate_items;