Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 1b9948c2

Von Bernd Bleßmann vor etwa 1 Jahr hinzugefügt

  • ID 1b9948c224014bf95b7b94e3b7d5e072db7705f4
  • Vorgänger 10c514e3
  • Nachfolger e26719e5

Lieferantenauftragsbestätigung: DB und Nummernkreis

Unterschiede anzeigen:

SL/BackgroundJob/SetNumberRange.pm
29 29

  
30 30
  my $defaults   = SL::DB::Default->get;
31 31

  
32
  foreach (qw(invnumber cnnumber soinumber pqinumber sonumber ponumber sqnumber rfqnumber sdonumber pdonumber)) {
32
  foreach (qw(invnumber cnnumber soinumber pqinumber sonumber ponumber pocnumber sqnumber rfqnumber sdonumber pdonumber)) {
33 33
    my $current_number = SL::PrefixedNumber->new(number => $defaults->{$_});
34 34
    $current_number->set_to($next_year * $multiplier);
35 35
    $defaults->{$_} = $current_number->get_current;
SL/DB/Helper/TransNumberGenerator.pm
34 34
              request_quotation         => { number_column => 'quonumber',      number_range_column => 'rfqnumber',      scoping => \&oe_scoping,    },
35 35
              purchase_quotation_intake => { number_column => 'quonumber',      number_range_column => 'pqinumber',      scoping => \&oe_scoping,    },
36 36
              purchase_order            => { number_column => 'ordnumber',      number_range_column => 'ponumber',       scoping => \&oe_scoping,    },
37
              purchase_order_confirmation => { number_column => 'ordnumber',    number_range_column => 'pocnumber',      scoping => \&oe_scoping,    },
37 38
              sales_delivery_order      => { number_column => 'donumber',       number_range_column => 'sdonumber',      scoping => \&do_scoping,    },
38 39
              purchase_delivery_order   => { number_column => 'donumber',       number_range_column => 'pdonumber',      scoping => \&do_scoping,    },
39 40
              supplier_delivery_order   => { number_column => 'donumber',       number_range_column => 'sudonumber',     scoping => \&do_scoping,    },
SL/DB/Manager/Order.pm
36 36
      SALES_ORDER_TYPE(),
37 37
      SALES_QUOTATION_TYPE(),
38 38
      PURCHASE_ORDER_TYPE(),
39
      PURCHASE_ORDER_CONFIRMATION_TYPE(),
39 40
      REQUEST_QUOTATION_TYPE(),
40 41
      PURCHASE_QUOTATION_INTAKE_TYPE(),
41 42
    ));
SL/DB/MetaSetup/Default.pm
151 151
  partsgroup_required                       => { type => 'boolean', default => 'false', not_null => 1 },
152 152
  payments_changeable                       => { type => 'integer', default => '0', not_null => 1 },
153 153
  pdonumber                                 => { type => 'text' },
154
  pocnumber                                 => { type => 'text' },
154 155
  ponumber                                  => { type => 'text' },
155 156
  pqinumber                                 => { type => 'text' },
156 157
  precision                                 => { type => 'numeric', default => '0.01', not_null => 1, precision => 15, scale => 5 },
SL/TransNumber.pm
17 17
);
18 18

  
19 19
my @SUPPORTED_TYPES = (
20
  qw(invoice invoice_for_advance_payment final_invoice credit_note customer vendor sales_delivery_order purchase_delivery_order sales_order_intake sales_order purchase_order sales_quotation request_quotation purchase_quotation_intake part service assembly assortment letter),
20
  qw(invoice invoice_for_advance_payment final_invoice credit_note customer vendor sales_delivery_order purchase_delivery_order sales_order_intake sales_order purchase_order purchase_order_confirmation sales_quotation request_quotation purchase_quotation_intake part service assembly assortment letter),
21 21
  @{ SL::DB::DeliveryOrder::TypeData::valid_types() },
22 22
);
23 23

  
......
72 72
    $filters{where}         = 'NOT COALESCE(quotation, FALSE)';
73 73
    $filters{where}        .= $type =~ /^sales/ ? ' AND (customer_id IS NOT NULL)' : ' AND (vendor_id IS NOT NULL)';
74 74

  
75
  } elsif ($type =~ /^purchase_order_confirmation$/) {
76
    $filters{trans_number}  = "ordnumber";
77
    $filters{numberfield}   = "pocnumber";
78
    $filters{table}         = "oe";
79
    $filters{where}         = 'record_type = ?';
80
    $filters{values}        = $type;
81

  
75 82
  } elsif ($type =~ /_quotation$/) {
76 83
    $filters{trans_number}  = "quonumber";
77 84
    $filters{numberfield}   = $type eq 'sales_quotation' ? "sqnumber" : "rfqnumber";
sql/Pg-upgrade2/oe_purchase_order_confirmation.sql
1
-- @tag: oe_purchase_order_confirmation
2
-- @description: Neuer Einkaufsbeleg: Lieferantenauftragsbesätigung (purchase_order_confirmation)
3
-- @depends: release_3_8_0
4

  
5
ALTER TABLE defaults ADD pocnumber TEXT;
templates/design40_webpages/client_config/_ranges_of_numbers.html
46 46
      <th>[% LxERP.t8('Purchase Order') %]</th>
47 47
      <td>[% L.input_tag("defaults.ponumber", SELF.defaults.ponumber, size="15", class="wi-normal") %]</td>
48 48
    </tr>
49
    <tr>
50
      <th>[% LxERP.t8('Purchase Order Confirmation') %]</th>
51
      <td>[% L.input_tag("defaults.pocnumber", SELF.defaults.pocnumber, size="15", class="wi-normal") %]</td>
52
    </tr>
49 53
    <tr>
50 54
      <th>[% LxERP.t8('Sales quotation') %]</th>
51 55
      <td>[% L.input_tag("defaults.sqnumber", SELF.defaults.sqnumber, size="15", class="wi-normal") %]</td>
templates/webpages/client_config/_ranges_of_numbers.html
41 41
   <td>[% L.input_tag("defaults.articlenumber", SELF.defaults.articlenumber, size="15") %]</td>
42 42
  </tr>
43 43

  
44
  <tr>
45
   <td align="right" nowrap>[% LxERP.t8('Last Purchase Order Confirmation Number') %]</td>
46
   <td>[% L.input_tag("defaults.pocnumber", SELF.defaults.pocnumber, size="15") %]</td>
47
  </tr>
48

  
44 49
  <tr>
45 50
   <td align="right" nowrap>[% LxERP.t8('Last Sales Quotation Number') %]</td>
46 51
   <td>[% L.input_tag("defaults.sqnumber", SELF.defaults.sqnumber, size="15") %]</td>

Auch abrufbar als: Unified diff