From: Jan Büren <jan@kivitendo-premium.de>
Date: Sat, 10 Oct 2015 14:06:28 +0000 (+0200)
Subject: Massenkonvertierung Lieferschein - Rechnungen. Detailverbesserungen
X-Git-Tag: release-3.4.1~642
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0878ce8165e72571703d06999a9972be4c5adb92;p=kivitendo-erp.git

Massenkonvertierung Lieferschein - Rechnungen. Detailverbesserungen

Aufgrund der Code-QS von Bernd folgende Details bei der Massenkonvertierung
von Lieferscheinen nach Rechnungen eingebaut:
a) Das Model filtert jetzt nur nach offenen Verkaufslieferscheinen und
 nicht noch zusätzlich nach offenen, aber gelieferten Verkaufslieferscheinen.
b) Felder die mit CKEditor editiert wurden, werden zwar völlig richtig
 in das Invoice-Objekt editiert, ABER beim Massenausdruck über den Background-Job
 wird nicht automatisch der HTML-Code in LaTeX Code gewandelt. Daher erfolgte
 der Ausdruck als HTML-Code (<strong>Dies ist fett</strong>) im PDF.
 Entsprechend für die manuelle Auswahl als auch für die Background-Job geändert.
c) Der Filter im Bericht filtert nach transdate (Belegdatum) und nicht nach Lieferdatum.
 Entsprechend hier die richtige Beschriftung gesetzt.
---

diff --git a/SL/BackgroundJob/MassRecordCreationAndPrinting.pm b/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
index e14e13190..7c6f558ab 100644
--- a/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
+++ b/SL/BackgroundJob/MassRecordCreationAndPrinting.pm
@@ -101,8 +101,13 @@ sub convert_invoices_to_pdf {
         template  => $ctrl->find_template(name => 'invoice', printer_id => $printer_id),
         variables => Form->new(''),
         return    => 'file_name',
+        variable_content_types => { longdescription => 'html',
+                                    partnotes       => 'html',
+                                    notes           => 'html',}
       );
 
+
+
       $create_params{variables}->{$_} = $variables{$_} for keys %variables;
 
       $invoice->flatten_to_form($create_params{variables}, format_amounts => 1);
diff --git a/SL/Controller/MassInvoiceCreatePrint.pm b/SL/Controller/MassInvoiceCreatePrint.pm
index 0e62700bb..7fc3388e7 100644
--- a/SL/Controller/MassInvoiceCreatePrint.pm
+++ b/SL/Controller/MassInvoiceCreatePrint.pm
@@ -216,7 +216,6 @@ sub _init_sales_delivery_order_models {
    query        => [
       '!customer_id' => undef,
       or             => [ closed    => undef, closed    => 0 ],
-      or             => [ delivered => undef, delivered => 0 ],
     ],
   );
 }
@@ -277,6 +276,9 @@ sub create_pdfs {
       template  => $self->find_template(name => 'invoice', printer_id => $params{printer_id}),
       variables => Form->new(''),
       return    => 'file_name',
+      variable_content_types => { longdescription => 'html',
+                                  partnotes       => 'html',
+                                  notes           => 'html',}
     );
 
     $create_params{variables}->{$_} = $params{variables}->{$_} for keys %{ $params{variables} };
@@ -346,8 +348,8 @@ sub make_filter_summary {
 
   my @filters = (
     [ $filter->{customer}{"name:substr::ilike"}, t8('Customer') ],
-    [ $filter->{"transdate:date::ge"},           t8('Delivery Date') . " " . t8('From Date') ],
-    [ $filter->{"transdate:date::le"},           t8('Delivery Date') . " " . t8('To Date')   ],
+    [ $filter->{"transdate:date::ge"},           t8('Transdate') . " " . t8('From Date') ],
+    [ $filter->{"transdate:date::le"},           t8('Transdate') . " " . t8('To Date')   ],
   );
 
   for (@filters) {
diff --git a/templates/webpages/mass_invoice_create_print_from_do/_filter.html b/templates/webpages/mass_invoice_create_print_from_do/_filter.html
index fbddc5b62..1d906e138 100644
--- a/templates/webpages/mass_invoice_create_print_from_do/_filter.html
+++ b/templates/webpages/mass_invoice_create_print_from_do/_filter.html
@@ -13,24 +13,14 @@
      <th align="right">[% LxERP.t8('Customer') %]</th>
      <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, size = 20) %]</td>
     </tr>
-     <th align="right">[% LxERP.t8('Delivery Date') %] [% LxERP.t8('From Date') %]</th>
+     <th align="right">[% LxERP.t8('Transdate') %] [% LxERP.t8('From Date') %]</th>
      <td>[% L.date_tag('filter.transdate:date::ge', filter.transdate_date__ge) %]</td>
     </tr>
     <tr>
-     <th align="right">[% LxERP.t8('Delivery Date') %] [% LxERP.t8('To Date') %]</th>
+     <th align="right">[% LxERP.t8('Transdate') %] [% LxERP.t8('To Date') %]</th>
      <td>[% L.date_tag('filter.transdate:date::le', filter.transdate_date__le) %]</td>
     </tr>
-    <!-- TODO implement helper function nat sort here -->
-    <!-- tr>
-     <th align="right">[% LxERP.t8('From') %] [% LxERP.t8('Delivery Order Number') %]</th>
-     <td>[% L.input_tag('filter.donumber:number::ge', filter.donumber_number__ge) %]</td>
-    </tr>
-    <tr>
-     <th align="right">[% LxERP.t8('To') %] [% LxERP.t8('Delivery Order Number') %]</th>
-     <td>[% L.input_tag('filter.donumber:number::le', filter.donumber_number__le) %]</td>
-    </tr -->
-
-   </table>
+  </table>
 
    [% L.hidden_tag('action', 'MassInvoiceCreatePrint/dispatch') %]
    [% L.hidden_tag('sort_by', FORM.sort_by) %]