Merge branch 'master' of ssh://lx-office.linet-services.de/~/lx-office-erp

diff --git a/SL/BP.pm b/SL/BP.pm
index b981f18..e2b7a2a 100644 (file)
--- a/SL/BP.pm
+++ b/SL/BP.pm
@@ -47,7 +47,6 @@ sub get_vc {
   my $dbh = $form->dbconnect($myconfig);
 
   my %arap = (invoice           => 'ar',
-              packing_list      => 'ar',
               sales_order       => 'oe',
               purchase_order    => 'oe',
               sales_quotation   => 'oe',
@@ -183,7 +182,7 @@ sub get_spoolfiles {
     }
   }
 
-  if ($form->{type} =~ /(invoice|sales_order|sales_quotation|packing_list|puchase_order|request_quotation)$/) {
+  if ($form->{type} =~ /(invoice|sales_order|sales_quotation|puchase_order|request_quotation)$/) {
     if ($form->{transdatefrom}) {
       $query .= " AND a.transdate >= ?";
       push(@values, $form->{transdatefrom});

diff --git a/SL/Form.pm b/SL/Form.pm
index 7b7746d..41ccab8 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1374,7 +1374,6 @@ sub get_formname_translation {
     bin_list                => $main::locale->text('Bin List'),
     credit_note             => $main::locale->text('Credit Note'),
     invoice                 => $main::locale->text('Invoice'),
-    packing_list            => $main::locale->text('Packing List'),
     pick_list               => $main::locale->text('Pick List'),
     proforma                => $main::locale->text('Proforma Invoice'),
     purchase_order          => $main::locale->text('Purchase Order'),
@@ -1382,7 +1381,6 @@ sub get_formname_translation {
     sales_order             => $main::locale->text('Confirmation'),
     sales_quotation         => $main::locale->text('Quotation'),
     storno_invoice          => $main::locale->text('Storno Invoice'),
-    storno_packing_list     => $main::locale->text('Storno Packing List'),
     sales_delivery_order    => $main::locale->text('Delivery Order'),
     purchase_delivery_order => $main::locale->text('Delivery Order'),
     dunning                 => $main::locale->text('Dunning'),
@@ -3225,7 +3223,6 @@ sub save_status {
 # $main::locale->text('invoice')
 # $main::locale->text('proforma')
 # $main::locale->text('sales_order')
-# $main::locale->text('packing_list')
 # $main::locale->text('pick_list')
 # $main::locale->text('purchase_order')
 # $main::locale->text('bin_list')

diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl
index e339790..1dc7344 100644 (file)
--- a/bin/mozilla/amtemplates.pl
+++ b/bin/mozilla/amtemplates.pl
@@ -138,29 +138,29 @@ sub display_template_form {
 
     my %formname_setup =
       (
-#        "balance_sheet"       => { "translation" => $locale->text('Balance Sheet'), "html" => 1 },
-        "bin_list"            => $locale->text('Bin List'),
-        "bwa"                 => { "translation" => $locale->text('BWA'), "html" => 1 },
-        "check"               => { "translation" => $locale->text('Check'), "html" => 1 },
-        "credit_note"         => $locale->text('Credit Note'),
-        "income_statement"    => { "translation" => $locale->text('Income Statement'), "html" => 1 },
-        "invoice"             => $locale->text('Invoice'),
-        "packing_list"        => $locale->text('Packing List'),
-        "pick_list"           => $locale->text('Pick List'),
-        "proforma"            => $locale->text('Proforma Invoice'),
-        "purchase_order"      => $locale->text('Purchase Order'),
-        "receipt"             => { "translation" => $locale->text('Receipt'), "tex" => 1 },
-        "request_quotation"   => $locale->text('RFQ'),
-        "sales_order"         => $locale->text('Confirmation'),
-        "sales_quotation"     => $locale->text('Quotation'),
-        "statement"           => $locale->text('Statement'),
-        "storno_invoice"      => $locale->text('Storno Invoice'),
-        "storno_packing_list" => $locale->text('Storno Packing List'),
-        "ustva-2004"          => { "translation" => $locale->text("USTVA 2004"), "tex" => 1 },
-        "ustva-2005"          => { "translation" => $locale->text("USTVA 2005"), "tex" => 1 },
-        "ustva-2006"          => { "translation" => $locale->text("USTVA 2006"), "tex" => 1 },
-        "ustva-2007"          => { "translation" => $locale->text("USTVA 2007"), "tex" => 1 },
-        "ustva"               => $locale->text("USTVA"),
+        # balance_sheet           => { translation => $locale->text('Balance Sheet'),             html => 1 },
+        bin_list                => $locale->text('Bin List'),
+        bwa                     => { translation => $locale->text('BWA'),                       html => 1 },
+        check                   => { translation => $locale->text('Check'),                     html => 1 },
+        credit_note             => $locale->text('Credit Note'),
+        income_statement        => { translation => $locale->text('Income Statement'),          html => 1 },
+        invoice                 => $locale->text('Invoice'),
+        pick_list               => $locale->text('Pick List'),
+        proforma                => $locale->text('Proforma Invoice'),
+        purchase_delivery_order => { translation => $::locale->text('Purchase delivery order'), tex => 1 },
+        purchase_order          => $locale->text('Purchase Order'),
+        receipt                 => { translation => $locale->text('Receipt'),                   tex => 1 },
+        request_quotation       => $locale->text('RFQ'),
+        sales_delivery_order    => { translation => $::locale->text('Sales delivery order'),    tex => 1 },
+        sales_order             => $locale->text('Confirmation'),
+        sales_quotation         => $locale->text('Quotation'),
+        statement               => $locale->text('Statement'),
+        storno_invoice          => $locale->text('Storno Invoice'),
+        "ustva-2004"            => { translation => $locale->text("USTVA 2004"),                tex => 1 },
+        "ustva-2005"            => { translation => $locale->text("USTVA 2005"),                tex => 1 },
+        "ustva-2006"            => { translation => $locale->text("USTVA 2006"),                tex => 1 },
+        "ustva-2007"            => { translation => $locale->text("USTVA 2007"),                tex => 1 },
+        ustva                   => $locale->text("USTVA"),
       );
 
     my (@values, $file, $setup);

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 1196763..173f8b6 100644 (file)
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -59,14 +59,6 @@ sub assert_bp_access {
   if ($form->{type} && $access_map{$form->{type}}) {
     $main::auth->assert($access_map{$form->{type}});
 
-  } elsif ($form->{type} eq 'packing_list') {
-    $main::lxdebug->message(0, "1");
-    if (!$main::auth->assert('sales_order_edit', 1)) {
-    $main::lxdebug->message(0, "2");
-      $main::auth->assert('invoice_edit') ;
-    }
-    $main::lxdebug->message(0, "3");
-
   } else {
     $main::auth->assert('DOES_NOT_EXIST');
   }
@@ -84,7 +76,6 @@ sub search {
   assert_bp_access();
 
   # $locale->text('Sales Invoices')
-  # $locale->text('Packing Lists')
   # $locale->text('Sales Orders')
   # $locale->text('Purchase Orders')
   # $locale->text('Quotations')
@@ -109,8 +100,6 @@ sub search {
   my %label = (
        invoice =>
          { title => 'Sales Invoices', name => 'Customer', l_invnumber => 'Y' },
-       packing_list =>
-         { title => 'Packing Lists', name => 'Customer', l_invnumber => 'Y' },
        sales_order =>
          { title => 'Sales Orders', name => 'Customer', l_ordnumber => 'Y' },
        purchase_order =>
@@ -148,8 +137,6 @@ sub search {
         </tr>
 |;
 
-  $label{packing_list}{invnumber}      = $label{invoice}{invnumber};
-  $label{packing_list}{ordnumber}      = $label{invoice}{ordnumber};
   $label{sales_order}{ordnumber}       = $label{invoice}{ordnumber};
   $label{purchase_order}{ordnumber}    = $label{invoice}{ordnumber};
   $label{request_quotation}{quonumber} = $label{sales_quotation}{quonumber};
@@ -476,9 +463,6 @@ sub list_spool {
   my $name = ucfirst $form->{vc};
 
   my @columns = qw(transdate);
-  if ($form->{type} =~ /(invoice|packing_list|check|receipt)/) {
-    push @columns, "invnumber";
-  }
   if ($form->{type} =~ /_order$/) {
     push @columns, "ordnumber";
   }

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 0b3dfab..b50fe4e 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1151,7 +1151,6 @@ sub print_options {
     ) : undef,
     ($form->{type} eq 'invoice' && $form->{storno}) ? (
       opthash("storno_invoice",      $form->{PD}{storno_invoice},      $locale->text('Storno Invoice')),
-      opthash("storno_packing_list", $form->{PD}{storno_packing_list}, $locale->text('Storno Packing List'))
     ) : undef,
     ($form->{type} =~ /_delivery_order$/) ? (
       opthash($form->{type},         $form->{PD}{$form->{type}},       $locale->text('Delivery Order')),
@@ -1297,11 +1296,6 @@ sub print_form {
   if ($form->{formname} eq "invoice") {
     $form->{label} = $locale->text('Invoice');
   }
-  if ($form->{formname} eq "packing_list") {
-
-    # this is from an invoice
-    $form->{label} = $locale->text('Packing List');
-  }
   if ($form->{formname} eq 'sales_order') {
     $inv                  = "ord";
     $due                  = "req";
@@ -1331,17 +1325,6 @@ sub print_form {
     $order                = 1;
   }
 
-  if ($form->{formname} eq 'packing_list' && $form->{type} ne 'invoice') {
-
-    # we use the same packing list as from an invoice
-    $inv = "ord";
-    $due = "req";
-    $form->{invdate} = $form->{"${inv}date"} = $form->{transdate};
-    $form->{label} = $locale->text('Packing List');
-    $order = 1;
-    # set invnumber for template packing_list
-    $form->{invnumber}   = $form->{ordnumber};
-  }
   if ($form->{formname} eq 'purchase_order') {
     $inv                  = "ord";
     $due                  = "req";
@@ -1402,8 +1385,6 @@ sub print_form {
 
   # $locale->text('Invoice Number missing!')
   # $locale->text('Invoice Date missing!')
-  # $locale->text('Packing List Number missing!')
-  # $locale->text('Packing List Date missing!')
   # $locale->text('Order Number missing!')
   # $locale->text('Order Date missing!')
   # $locale->text('Quotation Number missing!')

diff --git a/locale/de/all b/locale/de/all
index 9735b39..f7bc612 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1171,9 +1171,6 @@ $self->{texts} = {
   'POSTED'                      => 'Gebucht',
   'POSTED AS NEW'               => 'Als neu gebucht',
   'PRINTED'                     => 'Gedruckt',
-  'Packing List'                => 'Packliste',
-  'Packing List Date missing!'  => 'Datum für Packliste fehlt!',
-  'Packing List Number missing!' => 'Packlistennummer fehlt!',
   'Packing Lists'               => 'Lieferschein',
   'Page #1/#2'                  => 'Seite #1/#2',
   'Paid'                        => 'bezahlt',
@@ -1521,7 +1518,6 @@ $self->{texts} = {
   'Storno'                      => 'Storno',
   'Storno (one letter abbreviation)' => 'S',
   'Storno Invoice'              => 'Stornorechnung',
-  'Storno Packing List'         => 'Stornolieferschein',
   'Street'                      => 'Straße',
   'Stylesheet'                  => 'Stilvorlage',
   'Subject'                     => 'Betreff',
@@ -2029,9 +2025,8 @@ $self->{texts} = {
   'open'                        => 'Offen',
   'order'                       => 'Reihenfolge',
   'our vendor number at customer' => 'Unsere Lieferanten-Nr. beim Kunden',
-  'packing_list'                => 'Versandliste',
   'part_list'                   => 'warenliste',
-  'pick_list'                   => 'Entnahmeliste',
+  'pick_list'                   => 'Sammelliste',
   'plural first char'           => 'P',
   'pos_bilanz'                  => 'Bilanz',
   'pos_bwa'                     => 'BWA',