Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 264b38c7

Von Philip Reetz vor fast 19 Jahren hinzugefügt

  • ID 264b38c7465f95066b47588c2fbe85f102bd022c
  • Vorgänger 9dffa52a
  • Nachfolger 89b63504

Bei der Umwandlung von Angeboten/Anfragen in Auftraege wurden verschiedene Felder beschnitten/flasch formatiert

Unterschiede anzeigen:

bin/mozilla/oe.pl
229 229

  
230 230
      map { $form->{"${_}_$i"} = $ref->{$_} } keys %{$ref};
231 231
    }
232
    
233 232
    for my $i (1 .. $form->{rowcount}) {
234 233
      if ($form->{id}) {
235 234
        $form->{"discount_$i"} =
236 235
          $form->format_amount(\%myconfig, $form->{"discount_$i"} * 100);
236
      } else {
237
        $form->{"discount_$i"} =
238
          $form->format_amount(\%myconfig, $form->{"discount_$i"});
237 239
      }
238 240
      ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);    
239 241
      $dec           = length $dec;
......
244 246

  
245 247
      $form->{"sellprice_$i"} =
246 248
        $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
247
                             $decimalplaces);
249
                            $decimalplaces);
248 250
      
249 251
      (my $dec_qty) = ($form->{"qty_$i"} =~ /\.(\d+)/);
250 252
      $dec_qty      = length $dec_qty;
......
832 834
      . $locale->text('Save as new') . qq|">
833 835
<input class=submit type=submit name=action value="|
834 836
      . $locale->text('Delete') . qq|">|;
835
    if ($form->{type} =~ /quotation$/) {
837
    if ($form->{type} =~ /sales_quotation$/) {
838
      print qq|
839
<input class=submit type=submit name=action value="|
840
        . $locale->text('Sales Order') . qq|">|;
841
    }
842
    if ($form->{type} =~ /request_quotation$/) {
836 843
      print qq|
837 844
<input class=submit type=submit name=action value="|
838
        . $locale->text('Order') . qq|">|;
845
        . $locale->text('Purchase Order') . qq|">|;
839 846
    }
840 847
    print qq|
841 848
<input class=submit type=submit name=action value="|
......
2101 2108
sub purchase_order {
2102 2109
  $lxdebug->enter_sub();
2103 2110

  
2111
  if (   $form->{type} eq 'sales_quotation'
2112
      || $form->{type} eq 'request_quotation') {
2113
    $form->{closed} = 1;
2114
    OE->save(\%myconfig, \%$form);
2115
  }
2116

  
2117
  ($null, $form->{cp_id}) = split /--/, $form->{contact};
2118
  $form->{cp_id} *= 1;
2119

  
2104 2120
  $form->{title} = $locale->text('Add Purchase Order');
2105 2121
  $form->{vc}    = "vendor";
2106 2122
  $form->{type}  = "purchase_order";

Auch abrufbar als: Unified diff