From 2f8ead125d69d2b91db9b1517bb6a3604ede1f6b Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 26 Aug 2014 14:00:33 +0200
Subject: [PATCH] Form->parse_template: notes nicht immer aus invoicenotes
 kopieren
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Wenn ein Beleg über Rose-Model-Code zum Drucken vorbereitet wird, dann
steht in $form->{notes} bereits der richtige Wert, und den
belegspezifische Wert $form->{invoicenotes} gibt es gar nicht. Also auch
notes damit nicht überschreiben.
---
 SL/Form.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SL/Form.pm b/SL/Form.pm
index a85902823..1368df738 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1034,7 +1034,7 @@ sub parse_template {
                                       %{ $self->{TEMPLATE_DRIVER_OPTIONS} || {} });
 
   # Copy the notes from the invoice/sales order etc. back to the variable "notes" because that is where most templates expect it to be.
-  $self->{"notes"} = $self->{ $self->{"formname"} . "notes" };
+  $self->{"notes"} = $self->{ $self->{"formname"} . "notes" } if exists $self->{ $self->{"formname"} . "notes" };
 
   if (!$self->{employee_id}) {
     $self->{"employee_${_}"} = $myconfig->{$_} for qw(email tel fax name signature);
-- 
2.20.1