Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision afb20e7c

Von Niclas Zimmermann vor mehr als 11 Jahren hinzugefügt

  • ID afb20e7cff40eac7a1f1e903da70602b4de7572a
  • Vorgänger 607a8079
  • Nachfolger 6bb3a615

Nummernkreis für Erzeugnisse

Für Erzeugnisse gibt es jetzt einen eigenen Nummernkreis. Lässt
man das Feld frei, wird weiterhin der Nummernkreis von Waren auch
für Erzeugnisse verwendet.

Unterschiede anzeigen:

SL/AM.pm
1084 1084
        vendornumber       = ?,
1085 1085
        articlenumber      = ?,
1086 1086
        servicenumber      = ?,
1087
        assemblynumber     = ?,
1087 1088
        sdonumber          = ?,
1088 1089
        pdonumber          = ?,
1089 1090
        curr               = ?,
......
1097 1098
                $form->{sqnumber},        $form->{rfqnumber},
1098 1099
                $form->{customernumber},  $form->{vendornumber},
1099 1100
                $form->{articlenumber},   $form->{servicenumber},
1101
                $form->{assemblynumber},
1100 1102
                $form->{sdonumber},       $form->{pdonumber},
1101 1103
                $currency,
1102 1104
                $form->{businessnumber},  $form->{weightunit},
SL/TransNumber.pm
69 69
  } elsif ($type =~ /part|service|assembly/) {
70 70
    $filters{trans_number}  = "partnumber";
71 71
    $filters{numberfield}   = $type eq 'service' ? 'servicenumber' : 'articlenumber';
72
    $filters{numberfield}   = $type eq 'assembly' ? 'assemblynumber' : $filters{numberfield};
72 73
    $filters{table}         = "parts";
73
    $filters{where}         = 'COALESCE(inventory_accno_id, 0) ' . ($type eq 'service' ? '=' : '<>') . ' 0';
74
    $filters{where}         = 'COALESCE(inventory_accno_id, 0) ' . ($type eq 'service' ? '= 0' : '<> 0 OR assembly');
74 75
  }
75 76

  
76 77
  return %filters;
......
129 130
  ($business_number) = selectfirst_array_query($form, $self->dbh, qq|SELECT customernumberinit FROM business WHERE id = ?|, $self->business_id) if $self->business_id;
130 131
  my $number         = $business_number;
131 132
  ($number)          = selectfirst_array_query($form, $self->dbh, qq|SELECT $filters{numberfield} FROM defaults|)                               if !$number;
133
  if ($filters{numberfield} eq 'assemblynumber' and length($number) < 1) {
134
    $filters{numberfield} = 'articlenumber';
135
    ($number)          = selectfirst_array_query($form, $self->dbh, qq|SELECT $filters{numberfield} FROM defaults|)                               if !$number;
136
  }
132 137
  $number          ||= '';
133 138
  my $sequence       = SL::PrefixedNumber->new(number => $number);
134 139

  
locale/de/all
1110 1110
  'Languages and translations'  => 'Sprachen und Übersetzungen',
1111 1111
  'Last Action'                 => 'Letzte Aktivität',
1112 1112
  'Last Article Number'         => 'Letzte Artikelnummer',
1113
  'Last Assembly Number'        => 'Letzte Erzeugnisnummer',
1113 1114
  'Last Cost'                   => 'Einkaufspreis',
1114 1115
  'Last Credit Note Number'     => 'Letzte Gutschriftnummer',
1115 1116
  'Last Customer Number'        => 'Letzte Kundennummer',
templates/webpages/am/edit_defaults.html
49 49
    <tr>
50 50
     <th align="right" nowrap>[% 'Last RFQ Number' | $T8 %]</th>
51 51
     <td><input name="rfqnumber" size="10" value="[% HTML.escape(defaults_rfqnumber) %]"></td>
52
     <th align="right" nowrap>[% 'Last Assembly Number' | $T8 %]</th>
53
     <td><input name="assemblynumber" size="10" value="[% HTML.escape(defaults_assemblynumber) %]"></td>
52 54
    </tr>
53 55

  
54 56
    <tr>
55 57
     <th align="right" nowrap>[% 'Last Sales Delivery Order Number' | $T8 %]</th>
56 58
     <td><input name="sdonumber" size="10" value="[% HTML.escape(defaults_sdonumber) %]"></td>
59
    </tr>
60

  
61
    <tr>
57 62
     <th align="right" nowrap>[% 'Last Purchase Delivery Order Number' | $T8 %]</th>
58 63
     <td><input name="pdonumber" size="10" value="[% HTML.escape(defaults_pdonumber) %]"></td>
59 64
    </tr>

Auch abrufbar als: Unified diff