Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f2463a51

Von Tamino Steinert vor mehr als 1 Jahr hinzugefügt

  • ID f2463a511e2901bde8f4809f8c0bec4a7c0965df
  • Vorgänger e7789457
  • Nachfolger 8c3ccb81

IO,DO,IR,IS,OE: Entferne Leerzeichen um Seriennummer

Unterschiede anzeigen:

SL/DO.pm
502 502
               $form->{"qty_$i"}, $baseqty,
503 503
               $form->{"sellprice_$i"}, $form->{"discount_$i"} / 100,
504 504
               $form->{"unit_$i"}, conv_date($items_reqdate), conv_i($form->{"project_id_$i"}),
505
               $form->{"serialnumber_$i"},
505
               trim($form->{"serialnumber_$i"}),
506 506
               $form->{"lastcost_$i"},
507 507
               conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}),
508 508
               conv_i($form->{"marge_price_factor_$i"}),
SL/IR.pm
40 40
use SL::Common;
41 41
use SL::CVar;
42 42
use SL::DATEV qw(:CONSTANTS);
43
use SL::Util qw(trim);
43 44
use SL::DBUtils;
44 45
use SL::DB::Draft;
45 46
use SL::DO;
......
457 458
               $form->{"description_$i"}, $restricter->process($form->{"longdescription_$i"}), $form->{"qty_$i"} * -1,
458 459
               $baseqty * -1, $form->{"sellprice_$i"}, $fxsellprice, $form->{"discount_$i"}, $allocated,
459 460
               $form->{"unit_$i"}, conv_date($form->{deliverydate}),
460
               conv_i($form->{"project_id_$i"}), $form->{"serialnumber_$i"},
461
               conv_i($form->{"project_id_$i"}), trim($form->{"serialnumber_$i"}),
461 462
               conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"price_factor_id_$i"}), conv_i($form->{"marge_price_factor_$i"}),
462 463
               $form->{"active_price_source_$i"}, $form->{"active_discount_source_$i"},
463 464
               $form->{"expense_chart_id_$i"}, $form->{"inventory_chart_id_$i"}, $form->{"tax_id_$i"}, $form->{"tax_chart_type_$i"},
SL/IS.pm
46 46
use SL::CVar;
47 47
use SL::Common;
48 48
use SL::DATEV qw(:CONSTANTS);
49
use SL::Util qw(trim);
49 50
use SL::DBUtils;
50 51
use SL::DO;
51 52
use SL::GenericTranslations;
......
1013 1014
                 $form->{"sellprice_$i"}, $fxsellprice,
1014 1015
                 $form->{"discount_$i"}, $allocated, 'f',
1015 1016
                 $form->{"unit_$i"}, conv_date($form->{"reqdate_$i"}), conv_i($form->{"project_id_$i"}),
1016
                 $form->{"serialnumber_$i"}, $pricegroup_id,
1017
                 trim($form->{"serialnumber_$i"}), $pricegroup_id,
1017 1018
                 $baseqty, $form->{"subtotal_$i"} ? 't' : 'f',
1018 1019
                 $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
1019 1020
                 $form->{"lastcost_$i"},
......
1763 1764
    my ($err, $qty, $wh_id, $bin_id, $chargenumber);
1764 1765

  
1765 1766
    if ($::instance_conf->get_sales_serial_eq_charge && $form->{"serialnumber_$i"}) {
1766
      my @serials = split(" ", $form->{"serialnumber_$i"});
1767
      my @serials = split(" ", trim($form->{"serialnumber_$i"}));
1767 1768
      if (scalar @serials != $form->{"qty_$i"}) {
1768 1769
        push @errors, $::locale->text("Cannot transfer #1 qty with #2 serial number(s)", $form->{"qty_$i"}, scalar @serials);
1769 1770
        last;
SL/OE.pm
764 764
           $form->{"qty_$i"}, $baseqty,
765 765
           $fxsellprice, $form->{"discount_$i"},
766 766
           $form->{"unit_$i"}, conv_date($reqdate), conv_i($form->{"project_id_$i"}),
767
           $form->{"serialnumber_$i"}, $form->{"ship_$i"},
767
           trim($form->{"serialnumber_$i"}), $form->{"ship_$i"},
768 768
           $pricegroup_id, $form->{"subtotal_$i"} ? 't' : 'f', $form->{"recurring_billing_mode_$i"} || 'always',
769 769
           $form->{"marge_percent_$i"}, $form->{"marge_absolut_$i"},
770 770
           $form->{"lastcost_$i"}, conv_i($form->{"price_factor_id_$i"}),
bin/mozilla/io.pl
482 482
        style => "width: 100px");
483 483
    }
484 484

  
485
    $column_data{serialnr}  = qq|<input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}">|;
485
    $column_data{serialnr}  = qq|<input name="serialnumber_$i" size="15" value="$form->{"serialnumber_$i"}" data-validate="trimmed_whitespaces">|;
486 486
    $column_data{projectnr} = NTI($cgi->popup_menu(
487 487
      '-name' => "project_id_$i",
488 488
      '-values' => \@projectnumber_values,

Auch abrufbar als: Unified diff