Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 38aac441

Von Moritz Bunkus vor fast 14 Jahren hinzugefügt

  • ID 38aac441bd2735f2af58e82f009e8369cf8afb0c
  • Vorgänger 67323585
  • Nachfolger 1f1c58f4

Vorlagentyp "packing_list" gibt es nicht mehr

Wurde ursprünglich als Lieferschein aus Rechnung heraus
ausgedruckt. Wird von der Funktionalität her von Einkaufs- und
Verkaufslieferscheinen ersetzt.

Unterschiede anzeigen:

SL/BP.pm
47 47
  my $dbh = $form->dbconnect($myconfig);
48 48

  
49 49
  my %arap = (invoice           => 'ar',
50
              packing_list      => 'ar',
51 50
              sales_order       => 'oe',
52 51
              purchase_order    => 'oe',
53 52
              sales_quotation   => 'oe',
......
183 182
    }
184 183
  }
185 184

  
186
  if ($form->{type} =~ /(invoice|sales_order|sales_quotation|packing_list|puchase_order|request_quotation)$/) {
185
  if ($form->{type} =~ /(invoice|sales_order|sales_quotation|puchase_order|request_quotation)$/) {
187 186
    if ($form->{transdatefrom}) {
188 187
      $query .= " AND a.transdate >= ?";
189 188
      push(@values, $form->{transdatefrom});
SL/Form.pm
1374 1374
    bin_list                => $main::locale->text('Bin List'),
1375 1375
    credit_note             => $main::locale->text('Credit Note'),
1376 1376
    invoice                 => $main::locale->text('Invoice'),
1377
    packing_list            => $main::locale->text('Packing List'),
1378 1377
    pick_list               => $main::locale->text('Pick List'),
1379 1378
    proforma                => $main::locale->text('Proforma Invoice'),
1380 1379
    purchase_order          => $main::locale->text('Purchase Order'),
......
1382 1381
    sales_order             => $main::locale->text('Confirmation'),
1383 1382
    sales_quotation         => $main::locale->text('Quotation'),
1384 1383
    storno_invoice          => $main::locale->text('Storno Invoice'),
1385
    storno_packing_list     => $main::locale->text('Storno Packing List'),
1386 1384
    sales_delivery_order    => $main::locale->text('Delivery Order'),
1387 1385
    purchase_delivery_order => $main::locale->text('Delivery Order'),
1388 1386
    dunning                 => $main::locale->text('Dunning'),
......
3225 3223
# $main::locale->text('invoice')
3226 3224
# $main::locale->text('proforma')
3227 3225
# $main::locale->text('sales_order')
3228
# $main::locale->text('packing_list')
3229 3226
# $main::locale->text('pick_list')
3230 3227
# $main::locale->text('purchase_order')
3231 3228
# $main::locale->text('bin_list')
bin/mozilla/amtemplates.pl
145 145
        "credit_note"         => $locale->text('Credit Note'),
146 146
        "income_statement"    => { "translation" => $locale->text('Income Statement'), "html" => 1 },
147 147
        "invoice"             => $locale->text('Invoice'),
148
        "packing_list"        => $locale->text('Packing List'),
149 148
        "pick_list"           => $locale->text('Pick List'),
150 149
        "proforma"            => $locale->text('Proforma Invoice'),
151 150
        "purchase_order"      => $locale->text('Purchase Order'),
......
155 154
        "sales_quotation"     => $locale->text('Quotation'),
156 155
        "statement"           => $locale->text('Statement'),
157 156
        "storno_invoice"      => $locale->text('Storno Invoice'),
158
        "storno_packing_list" => $locale->text('Storno Packing List'),
159 157
        "ustva-2004"          => { "translation" => $locale->text("USTVA 2004"), "tex" => 1 },
160 158
        "ustva-2005"          => { "translation" => $locale->text("USTVA 2005"), "tex" => 1 },
161 159
        "ustva-2006"          => { "translation" => $locale->text("USTVA 2006"), "tex" => 1 },
bin/mozilla/bp.pl
59 59
  if ($form->{type} && $access_map{$form->{type}}) {
60 60
    $main::auth->assert($access_map{$form->{type}});
61 61

  
62
  } elsif ($form->{type} eq 'packing_list') {
63
    $main::lxdebug->message(0, "1");
64
    if (!$main::auth->assert('sales_order_edit', 1)) {
65
    $main::lxdebug->message(0, "2");
66
      $main::auth->assert('invoice_edit') ;
67
    }
68
    $main::lxdebug->message(0, "3");
69

  
70 62
  } else {
71 63
    $main::auth->assert('DOES_NOT_EXIST');
72 64
  }
......
84 76
  assert_bp_access();
85 77

  
86 78
  # $locale->text('Sales Invoices')
87
  # $locale->text('Packing Lists')
88 79
  # $locale->text('Sales Orders')
89 80
  # $locale->text('Purchase Orders')
90 81
  # $locale->text('Quotations')
......
109 100
  my %label = (
110 101
       invoice =>
111 102
         { title => 'Sales Invoices', name => 'Customer', l_invnumber => 'Y' },
112
       packing_list =>
113
         { title => 'Packing Lists', name => 'Customer', l_invnumber => 'Y' },
114 103
       sales_order =>
115 104
         { title => 'Sales Orders', name => 'Customer', l_ordnumber => 'Y' },
116 105
       purchase_order =>
......
148 137
        </tr>
149 138
|;
150 139

  
151
  $label{packing_list}{invnumber}      = $label{invoice}{invnumber};
152
  $label{packing_list}{ordnumber}      = $label{invoice}{ordnumber};
153 140
  $label{sales_order}{ordnumber}       = $label{invoice}{ordnumber};
154 141
  $label{purchase_order}{ordnumber}    = $label{invoice}{ordnumber};
155 142
  $label{request_quotation}{quonumber} = $label{sales_quotation}{quonumber};
......
476 463
  my $name = ucfirst $form->{vc};
477 464

  
478 465
  my @columns = qw(transdate);
479
  if ($form->{type} =~ /(invoice|packing_list|check|receipt)/) {
480
    push @columns, "invnumber";
481
  }
482 466
  if ($form->{type} =~ /_order$/) {
483 467
    push @columns, "ordnumber";
484 468
  }
bin/mozilla/io.pl
1151 1151
    ) : undef,
1152 1152
    ($form->{type} eq 'invoice' && $form->{storno}) ? (
1153 1153
      opthash("storno_invoice",      $form->{PD}{storno_invoice},      $locale->text('Storno Invoice')),
1154
      opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List'))
1155 1154
    ) : undef,
1156 1155
    ($form->{type} =~ /_delivery_order$/) ? (
1157 1156
      opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Delivery Order')),
......
1297 1296
  if ($form->{formname} eq "invoice") {
1298 1297
    $form->{label} = $locale->text('Invoice');
1299 1298
  }
1300
  if ($form->{formname} eq "packing_list") {
1301

  
1302
    # this is from an invoice
1303
    $form->{label} = $locale->text('Packing List');
1304
  }
1305 1299
  if ($form->{formname} eq 'sales_order') {
1306 1300
    $inv                  = "ord";
1307 1301
    $due                  = "req";
......
1331 1325
    $order                = 1;
1332 1326
  }
1333 1327

  
1334
  if ($form->{formname} eq 'packing_list' && $form->{type} ne 'invoice') {
1335

  
1336
    # we use the same packing list as from an invoice
1337
    $inv = "ord";
1338
    $due = "req";
1339
    $form->{invdate} = $form->{"${inv}date"} = $form->{transdate};
1340
    $form->{label} = $locale->text('Packing List');
1341
    $order = 1;
1342
    # set invnumber for template packing_list
1343
    $form->{invnumber}   = $form->{ordnumber};
1344
  }
1345 1328
  if ($form->{formname} eq 'purchase_order') {
1346 1329
    $inv                  = "ord";
1347 1330
    $due                  = "req";
......
1402 1385

  
1403 1386
  # $locale->text('Invoice Number missing!')
1404 1387
  # $locale->text('Invoice Date missing!')
1405
  # $locale->text('Packing List Number missing!')
1406
  # $locale->text('Packing List Date missing!')
1407 1388
  # $locale->text('Order Number missing!')
1408 1389
  # $locale->text('Order Date missing!')
1409 1390
  # $locale->text('Quotation Number missing!')
locale/de/all
1171 1171
  'POSTED'                      => 'Gebucht',
1172 1172
  'POSTED AS NEW'               => 'Als neu gebucht',
1173 1173
  'PRINTED'                     => 'Gedruckt',
1174
  'Packing List'                => 'Packliste',
1175
  'Packing List Date missing!'  => 'Datum für Packliste fehlt!',
1176
  'Packing List Number missing!' => 'Packlistennummer fehlt!',
1177 1174
  'Packing Lists'               => 'Lieferschein',
1178 1175
  'Page #1/#2'                  => 'Seite #1/#2',
1179 1176
  'Paid'                        => 'bezahlt',
......
1521 1518
  'Storno'                      => 'Storno',
1522 1519
  'Storno (one letter abbreviation)' => 'S',
1523 1520
  'Storno Invoice'              => 'Stornorechnung',
1524
  'Storno Packing List'         => 'Stornolieferschein',
1525 1521
  'Street'                      => 'Straße',
1526 1522
  'Stylesheet'                  => 'Stilvorlage',
1527 1523
  'Subject'                     => 'Betreff',
......
2029 2025
  'open'                        => 'Offen',
2030 2026
  'order'                       => 'Reihenfolge',
2031 2027
  'our vendor number at customer' => 'Unsere Lieferanten-Nr. beim Kunden',
2032
  'packing_list'                => 'Versandliste',
2033 2028
  'part_list'                   => 'warenliste',
2034 2029
  'pick_list'                   => 'Entnahmeliste',
2035 2030
  'plural first char'           => 'P',

Auch abrufbar als: Unified diff