]> wagnertech.de Git - mfinanz.git/commitdiff
Merge branch 'master' of ssh://lx-office/~/lx-office-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 28 Dec 2010 14:49:48 +0000 (15:49 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 28 Dec 2010 14:49:48 +0000 (15:49 +0100)
17 files changed:
SL/BP.pm
SL/DN.pm
SL/Form.pm
SL/IS.pm
bin/mozilla/amtemplates.pl
bin/mozilla/bp.pl
bin/mozilla/io.pl
bin/mozilla/is.pl
locale/de/all
templates/Default-packing_list.html [deleted file]
templates/Default-packing_list.tex [deleted file]
templates/French-packing_list.html [deleted file]
templates/French-packing_list.tex [deleted file]
templates/German-packing_list.html [deleted file]
templates/German-packing_list.tex [deleted file]
templates/Service-packing_list.html [deleted file]
templates/Service-packing_list.tex [deleted file]

index b981f1842a910a5855e22084f15750409974fc15..e2b7a2a0ddf448f8eca94a260290fa8e44f8dcd3 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});
index 45bc367ebc389fa160d92ba9754013c4aafebd01..2cc87df2c3168946a07531be8f7b86ab8010aff8 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -36,6 +36,7 @@ package DN;
 
 use SL::Common;
 use SL::DBUtils;
+use SL::GenericTranslations;
 use SL::IS;
 use SL::Mailer;
 use SL::MoreCommon;
@@ -503,7 +504,12 @@ sub get_invoices {
               ORDER BY dunning_level ASC
               LIMIT 1)
              , ?))
-       LEFT JOIN dunning d ON ((d.trans_id = a.id) AND (cfg.dunning_level = d.dunning_level))
+       LEFT JOIN dunning d ON (d.id = (
+         SELECT MAX(d2.id)
+         FROM dunning d2
+         WHERE (d2.trans_id      = a.id)
+           AND (d2.dunning_level = cfg.dunning_level)
+       ))
 
        WHERE (a.paid < a.amount)
          AND (a.duedate < current_date)
@@ -782,6 +788,7 @@ sub print_dunning {
   $form->{total_open_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{total_open_amount}, 2), 2);
   $form->{total_amount}      = $form->format_amount($myconfig, $form->round_amount($ref->{fee} + $ref->{total_interest} + $ref->{total_open_amount}, 2), 2);
 
+  $self->set_customer_cvars($myconfig, $form);
   $self->set_template_options($myconfig, $form);
 
   my $filename          = "dunning_${dunning_id}_" . Common::unique_id() . ".pdf";
@@ -832,7 +839,7 @@ sub print_invoice_for_fees {
   $query =
     qq|SELECT
          ar.invnumber, ar.transdate AS invdate, ar.amount, ar.netamount,
-         ar.duedate,   ar.notes,     ar.notes AS invoicenotes,
+         ar.duedate,   ar.notes,     ar.notes AS invoicenotes, ar.customer_id,
 
          c.name,      c.department_1,   c.department_2, c.street, c.zipcode, c.city, c.country,
          c.contact,   c.customernumber, c.phone,        c.fax,    c.email,
@@ -873,6 +880,7 @@ sub print_invoice_for_fees {
 
   map { $form->{$_} = $form->format_amount($myconfig, $form->{$_}, 2) } qw(fee interest invamount);
 
+  $self->set_customer_cvars($myconfig, $form);
   $self->set_template_options($myconfig, $form);
 
   my $filename = Common::unique_id() . "dunning_invoice_${dunning_id}.pdf";
@@ -896,4 +904,18 @@ sub print_invoice_for_fees {
   $main::lxdebug->leave_sub();
 }
 
+sub set_customer_cvars {
+  my ($self, $myconfig, $form) = @_;
+
+  my $custom_variables = CVar->get_custom_variables(dbh      => $form->get_standard_dbh,
+                                                    module   => 'CT',
+                                                    trans_id => $form->{customer_id});
+  map { $form->{"vc_cvar_$_->{name}"} = $_->{value} } @{ $custom_variables };
+
+  $form->{cp_greeting} = GenericTranslations->get(dbh              => $form->get_standard_dbh,
+                                                  translation_type => 'greetings::' . ($form->{cp_gender} eq 'f' ? 'female' : 'male'),
+                                                  language_id      => $form->{language_id},
+                                                  allow_fallback   => 1);
+}
+
 1;
index 7b7746d0c5a6052f32977e01efa3510e7295ad26..41ccab8d9cca93333ff3ba7f23e76fac960ba8e4 100644 (file)
@@ -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')
index d1358dec5c4b7b3673d2922824c3219759b2c293..e9e4711b1c02fa6830434a2336a906bff1e5b1a6 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -2076,14 +2076,14 @@ sub get_pricegroups_for_parts {
           $pkr->{price}    = $form->{"sellprice_$i"};
           $pkr->{selected} = ' selected';
         }
-      }
-
-      if ($selectedpricegroup_id or $selectedpricegroup_id == 0) {
+      } else {
         if ($selectedpricegroup_id ne $pricegroup_old) {
           if ($pkr->{pricegroup_id} eq $selectedpricegroup_id) {
             $pkr->{selected}  = ' selected';
           }
-        } elsif (($price_new != $form->{"sellprice_$i"}) and ($price_new ne 0)) {
+        } elsif (    (   $form->parse_amount($myconfig, $price_new)
+                      != $form->parse_amount($myconfig, $form->{"sellprice_$i"}))
+                 and ($price_new ne 0)) {
           if ($pkr->{pricegroup_id} == 0) {
             $pkr->{price}     = $form->{"sellprice_$i"};
             $pkr->{selected}  = ' selected';
index e3397906c449b1f6ede1e738dd40d24e04e8fc04..1dc734470fcfd4678f7e2860f41b83531a037df9 100644 (file)
@@ -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);
index 1196763fac39d01fc3dd2a3f8b213aeee7649f6b..173f8b6c182b858b10ea18ebdaab10679f63a9bf 100644 (file)
@@ -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";
   }
index 0b3dfabc2b478aba6195d8680c2f6ce55c8576f2..b50fe4e148eda0350161d86848de711af6af9c83 100644 (file)
@@ -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!')
index 9ec9becb8e71def539b85108f0a299c83dc727b1..b38cfd1d5446b3793fcd32ff9c4fc151990c308f 100644 (file)
@@ -266,6 +266,8 @@ sub prepare_invoice {
 
       $form->{"qty_$i"}        = $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty);
 
+      $form->{"sellprice_pg_$i"} = join ('--', $form->{"sellprice_$i"}, $form->{"pricegroup_id_$i"});
+
       $form->{rowcount}        = $i;
 
     }
@@ -423,9 +425,17 @@ sub form_footer {
   $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
   $form->{paid_indices} = [ 1 .. $form->{paidaccounts} ];
 
+  # Standard Konto für Umlaufvermögen
+  my $accno_arap = IS->get_standard_accno_current_assets(\%myconfig, \%$form);
+
   for my $i (1 .. $form->{paidaccounts}) {
     $form->{"selectAR_paid_$i"} = $form->{selectAR_paid};
-    $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
+    if (!$form->{"AR_paid_$i"}) {
+      $form->{"selectAR_paid_$i"} =~ s/option>$accno_arap--(.*?)</option selected>$accno_arap--$1</;
+    } else {
+      $form->{"selectAR_paid_$i"} =~ s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/;
+    }
+
     $totalpaid += $form->{"paid_$i"};
   }
 
index 9735b39e7029bf5abf5e1a78f4cc9ab68c2a1d40..f7bc6125b6f99f496602a4b695a893e3da157d3e 100644 (file)
@@ -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',
diff --git a/templates/Default-packing_list.html b/templates/Default-packing_list.html
deleted file mode 100644 (file)
index 68ed2ed..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr>
-  <td width=10>
-  </td> 
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <th colspan=2>
-      <h4 align=center>P A C K I N G &nbsp;&nbsp; L I S T</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Date</th><td width=10> </td><td><%invdate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Number</th><td></td><td><%invnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td> 
-      </td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Ship To:</th>
-    </tr>
-
-    <tr>
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-<%if shiptocontact%>
-      <p>Attn: <%shiptocontact%>
-<%end shiptocontact%>
-
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td> 
-    </td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Number</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qt'y</th>
-      <th>&nbsp;</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Notes</td>
-      <td><pre><%notes%></pre></td>
-<%end notes%>
-      <td align=right>
-      <%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Items returned are subject to
-    a 10% restocking charge. A return authorization must be obtained
-    from <%company%> before goods are returned. Returns must be shipped
-    prepaid and properly insured. <%company%> will not be responsible
-    for damages during transit.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Default-packing_list.tex b/templates/Default-packing_list.tex
deleted file mode 100644 (file)
index 2224f92..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-<%pagebreak 90 27 37%>
-\end{tabular*}
-
-\newpage
-
-\markright{<%company%>\hfill <%invnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rll@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Bin} \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{3.5cm}
-
-\textbf{P A C K I N G} \parbox{0.3cm}{\hfill} \textbf{L I S T}
-
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date} & <%invdate%> \\
-  \textbf{Number} & <%invnumber%> \\
-  \textbf{Customer} & <%customer_id%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rll@{}}
-  \textbf{Number} & \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} & \textbf{Bin} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%bin%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-\vfill
-\centerline{\textbf{Thank You for your valued business!}}
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-Items returned are subject to a 10\% restocking charge.
-A return authorization must be obtained from <%company%> before goods are
-returned. Returns must be shipped prepaid and properly insured.
-<%company%> will not be responsible for damages during transit.}
-
-\end{document}
-
diff --git a/templates/French-packing_list.html b/templates/French-packing_list.html
deleted file mode 100644 (file)
index 10b05f0..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-CTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional">
-
-<html>
-
-<head>
-
-<title>A2A <%invnumber%> <%name%></title>
-<meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
-</head>
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr>
-  <td width=10>
-  </td> 
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <th colspan=2>
-      <h4 align=center>L I S T E&nbsp;&nbsp;D ' E N V O I</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Date de facture&nbsp;:</th><td width=10> </td><td><%invdate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Numéro de facture&nbsp;:</th><td></td><td><%invnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td> 
-      </td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Adresse d'envoi</th>
-    </tr>
-
-    <tr>
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td> 
-    </td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>N°</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qté</th>
-      <th>&nbsp;</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=center><%qty%></td>
-      <td><%unit%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>À noter&nbsp;:</td>
-      <td><pre><%notes%></pre></td>
-<%end notes%>
-      <td align=right><b>EXPÉDIÉ PAR&nbsp;: 
-      <%shippingpoint%></b>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3><!--
-    Conditions d'envoi :
-    Items returned are subject to
-    a 10% restocking charge. A return authorization must be obtained
-    from <%company%> before goods are returned. Returns must be shipped
-    prepaid and properly insured. <%company%> will not be responsible
-    for damages during transit. -->
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/templates/French-packing_list.tex b/templates/French-packing_list.tex
deleted file mode 100644 (file)
index 8aa14c4..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage[frenchb]{babel}
-\usepackage[utf8]{inputenc}
-\usepackage{tabularx}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Téléphone & <%tel%>\\
-    Télécopieur & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-\newpage
-
-\markright{<%company%>\hfill <%invnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rll@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Bin} \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{3.5cm}
-
-\textbf{L I S T E} \parbox{0.3cm}{\hfill} \textbf{D E}
-\parbox{0.3cm}{\hfill} \textbf{P A Q U E T A G E}
-
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date de facture} & <%invdate%> \\
-  \textbf{Numéro de facture} & <%invnumber%> \\
-  \textbf{Numéro de client} & <%customer_id%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}lp{\descrwidth}@{\extracolsep\fill}rll@{}}
-  \textbf{Numéro} & \textbf{Description} & \textbf{Qté} &
-    \textbf{Unité} & \textbf{Bin} \\
-<%foreach number%>
-  <%number%> & <%description%> & <%qty%> &
-    <%unit%> & <%bin%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-\vfill
-\centerline{\textbf{Merci de faire affaire avec nous!}}
-
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-\footnotetext[1]{\tiny
-Les éléments retournés seront sujets à un supplément de remmagasinnage de
-10\%. Une autorisation de renvoi doit être obtenue au préalable auprès de
-<%company%>. Les frais de transports et d'assurance sur les éléments
-retournés devront être couvert par le client de façon appropriée.
-<%company%> ne peut être tenue responsable des dommages survenus pendant
-le transit.}
-
-\end{document}
diff --git a/templates/German-packing_list.html b/templates/German-packing_list.html
deleted file mode 100644 (file)
index 3aa1e2e..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr>
-  <td width=10>
-  </td> 
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <th colspan=2>
-      <h4 align=center>L I E F E R S C H E I N</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Datum</th><td width=10> </td><td><%invdate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Nummer</th><td></td><td><%invnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td> 
-      </td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Zustellung an:</th>
-    </tr>
-
-    <tr>
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-<%if shiptocontact%>
-      <p>An: <%shiptocontact%>
-<%end shiptocontact%>
-
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td> 
-    </td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Nummer</th>
-      <th align=left><font color=ffffff>Artikel</th>
-      <th><font color=ffffff>Anz</th>
-      <th>&nbsp;</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Bemerkungen</td>
-      <td><%notes%></td>
-<%end notes%>
-      <td align=right>
-      <%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Beschädigte Waren und Waren ohne Rückgabenummer werden nicht
-    entgegengenommen. Lagerkosten werden mit 10% berrechnet.
-    Waren müssen ausreichended verpackt und versichert sein.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/German-packing_list.tex b/templates/German-packing_list.tex
deleted file mode 100644 (file)
index 0a568fc..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\begin{document}
-
-\thispagestyle{empty}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-<%pagebreak 100 35 37%>
-\end{tabularx}
-
-\newpage
-
-\begin{tabularx}{\textwidth}{lXr}
-  \hline
-  \textbf{Pos} & \textbf{Bezeichnung} & \textbf{Liefermenge} \\
-  \hline
-<%end pagebreak%>
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{1.5cm}
-
-\begin{minipage}{8cm}
-  <%name%>
-
-  <%street%>
-
-  <%zipcode%> <%city%>
-
-  <%country%>
-\end{minipage}
-\hfill
-\begin{minipage}{6cm}
-  \rightline{\LARGE\textbf{\textit{Lieferschein}}}
-  \rightline{\large\textbf{\textit{Nr. <%invnumber%>%
-  }}}
-
-  Datum:\hfill <%invdate%>
-
-  Auftrag-Nr:\hfill <%ordnumber%>
-
-  Kunden-Nr:\hfill <%customernumber%>
-
-  Ansprechpartner:\hfill <%employee%>
-\end{minipage}
-
-\vspace*{0.5cm}
-
-Ihre Bestellung ex <%cusordnumber%> vom <%orddate%>
-\hfill
-
-\vspace*{0.5cm}
-
-\begin{tabularx}{\textwidth}{lXr}
-  \hline
-  \textbf{Pos} & \textbf{Bezeichnung} & \textbf{Liefermenge} \\
-  \hline
-<%foreach number%>
-  <%runningnumber%> & \raggedright <%description%> & <%qty%> <%unit%>\\
-<%end number%>
-\end{tabularx}
-
-\vspace{0.5cm}
-
-Liefertermin: <%deliverydate%>
-
-\vspace{0.5cm}
-
-Oben angeführte Positionen vollständig und ohne Mängel erhalten:
-\vspace*{2.5cm} \\
-\parbox[t]{6cm}{
-  \underline{\hspace*{6cm}}\\
-  \centerline{\small Datum / Unterschrift}
-}
-
-\end{document}
-
diff --git a/templates/Service-packing_list.html b/templates/Service-packing_list.html
deleted file mode 100644 (file)
index 68ed2ed..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-
-<body bgcolor=ffffff>
-
-<table width=100%>
-<tr>
-  <td width=10>
-  </td> 
-  <td>
-  
-  <table width=100%>
-  <tr>
-    <td>
-      <h4>
-      <%company%>
-      <br><%address%>
-      </h4>
-    </td>
-
-    <th colspan=2>
-      <h4 align=center>P A C K I N G &nbsp;&nbsp; L I S T</h4>
-    </th>
-  </tr>
-
-  </table>
-
-
-  <table width=100% callspacing=0 cellpadding=0>
-    
-  <tr>
-    <td align=right>
-    <table>
-    <tr>
-      <th align=right>Date</th><td width=10> </td><td><%invdate%></td>
-    </tr>
-  
-    <tr>
-      <th align=right>Number</th><td></td><td><%invnumber%></td></tr>
-    </tr>
-  
-    <tr>
-      <td> 
-      </td>
-    </tr>
-    </td>
-    </table>
-  </tr>
-
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Ship To:</th>
-    </tr>
-
-    <tr>
-      <td><%shiptoname%>
-      <br><%shiptostreet%>
-      <br><%shiptozipcode%>
-      <br><%shiptocity%>
-      <br><%shiptocountry%>
-<%if shiptocontact%>
-      <p>Attn: <%shiptocontact%>
-<%end shiptocontact%>
-
-      </td>
-    </tr>
-    </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td> 
-    </td>
-  </tr>
-  
-  <tr>
-    <td>
-    <table width=100%>
-    <tr bgcolor=000000>
-      <th align=left><font color=ffffff>Number</th>
-      <th align=left><font color=ffffff>Description</th>
-      <th><font color=ffffff>Qt'y</th>
-      <th>&nbsp;</th>
-    </tr>
-
-<%foreach number%>
-    <tr valign=top>
-      <td><%number%></td>
-      <td><%description%></td>
-      <td align=right><%qty%></td>
-      <td><%unit%></td>
-    </tr>
-<%end number%>
-
-    <tr>
-      <td colspan=4><hr noshade></td>
-    </tr>
-
-    </table>
-    </td>
-  </tr>
-
-<tr>
-  <td>
-  <table width=100%>
-    <tr valign=top>
-<%if notes%>
-      <td>Notes</td>
-      <td><pre><%notes%></pre></td>
-<%end notes%>
-      <td align=right>
-      <%shippingpoint%>
-      </td>
-    </tr>
-
-  </table>
-  </td>
-</tr>
-
-<tr>
-  <td>
-  <table width=100%>
-  <tr valign=top>
-    <td><font size=-3>
-    Items returned are subject to
-    a 10% restocking charge. A return authorization must be obtained
-    from <%company%> before goods are returned. Returns must be shipped
-    prepaid and properly insured. <%company%> will not be responsible
-    for damages during transit.
-    </font>
-    </td>
-    <td width=150>
-    X <hr noshade>
-    </td>
-  </tr>
-  </table>
-  </td>
-</tr>
-
-</table>
-
-</td>
-</tr>
-</table>
-
-</body>
-</html>
-
diff --git a/templates/Service-packing_list.tex b/templates/Service-packing_list.tex
deleted file mode 100644 (file)
index e967f78..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-\documentclass[twoside]{scrartcl}
-\usepackage[frame]{xy}
-\usepackage{tabularx}
-\usepackage[utf8]{inputenc}
-\setlength{\voffset}{0.5cm}
-\setlength{\hoffset}{-2.0cm}
-\setlength{\topmargin}{0cm}
-\setlength{\headheight}{0.5cm}
-\setlength{\headsep}{1cm}
-\setlength{\topskip}{0pt}
-\setlength{\oddsidemargin}{1.0cm}
-\setlength{\evensidemargin}{1.0cm}
-\setlength{\textwidth}{19.2cm}
-\setlength{\textheight}{24.5cm}
-\setlength{\footskip}{1cm}
-\setlength{\parindent}{0pt}
-\renewcommand{\baselinestretch}{1}
-\begin{document}
-
-\newlength{\descrwidth}\setlength{\descrwidth}{10cm}
-
-\newsavebox{\hdr}
-\sbox{\hdr}{
-  \fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-  \parbox{\textwidth}{
-    \parbox[b]{12cm}{
-      <%company%>
-      
-      <%address%>}\hfill
-    \begin{tabular}[b]{rr@{}}
-    Telephone & <%tel%>\\
-    Facsimile & <%fax%>
-    \end{tabular}
-
-    \rule[1.5ex]{\textwidth}{0.5pt}
-  }
-}
-    
-\fontfamily{cmss}\fontshape{n}\selectfont
-
-\markboth{<%company%>\hfill <%invnumber%>}{\usebox{\hdr}}
-
-\pagestyle{myheadings}
-%\thispagestyle{empty}     use this with letterhead paper
-
-<%pagebreak 90 27 48%>
-\end{tabular*}
-
-\newpage
-
-\markright{<%company%>\hfill <%invnumber%>}
-
-\vspace*{-12pt}
-
-\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rl@{}}
-  \textbf{Description} & \textbf{Qt'y} &
-    \textbf{Unit} \\
-<%end pagebreak%>
-
-
-\fontfamily{cmss}\fontsize{10pt}{12pt}\selectfont
-
-\vspace*{2cm}
-
-<%shiptoname%>
-
-<%shiptostreet%>
-
-<%shiptozipcode%>
-
-<%shiptocity%>
-
-<%shiptocountry%>
-
-\vspace{3.5cm}
-
-\textbf{P A C K I N G} \parbox{0.3cm}{\hfill} \textbf{L I S T}
-
-\hfill
-\begin{tabular}[t]{l@{\hspace{0.3cm}}l}
-  \textbf{Date} & <%invdate%> \\
-  \textbf{Number} & <%invnumber%> \\
-  \textbf{Customer} & <%customer_id%>
-\end{tabular}
-
-\vspace{1cm}
-
-\begin{tabular*}{\textwidth}{@{}p{\descrwidth}@{\extracolsep\fill}rl@{}}
-  \textbf{Description} & \textbf{Qt'y} & \textbf{Unit} \\
-<%foreach number%>
-  <%description%> & <%qty%> & <%unit%> \\
-<%end number%>
-\end{tabular*}
-
-
-\parbox{\textwidth}{
-\rule{\textwidth}{2pt}
-
-\vspace{12pt}
-
-<%if notes%>
-  <%notes%>
-<%end if%>
-
-}
-
-%\vfill
-%\centerline{\textbf{Thank You for your valued business!}}
-
-%\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-
-%\footnotetext[1]{\tiny
-%Items returned are subject to a 10\% restocking charge.
-%A return authorization must be obtained from <%company%> before goods are
-%returned. Returns must be shipped prepaid and properly insured.
-%<%company%> will not be responsible for damages during transit.}
-
-\end{document}
-