Bug 603: Interne Bemerkungen bei Workflow aus Lieferanten heraus

diff --git a/SL/IR.pm b/SL/IR.pm
index 2a74e0612b12c654f873935cb679aecb8433670f..e99a108cf31aed3953a80c503fb926356c2ae9a7 100644 (file)
--- a/SL/IR.pm
+++ b/SL/IR.pm
@@ -995,7 +995,7 @@ sub get_vendor {
   $form->{vendor_id} *= 1;
 
   # get vendor
-  my $query = qq|SELECT v.name AS vendor, v.creditlimit, v.terms,
+  my $query = qq|SELECT v.name AS vendor, v.creditlimit, v.terms, v.notes AS intnotes,
                  v.email, v.cc, v.bcc, v.language_id, v.payment_id,
                 v.street, v.zipcode, v.city, v.country, v.taxzone_id,
                  $duedate + COALESCE(pt.terms_netto, 0) AS duedate,

diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index c6eda1b9f5bf6f9dae3577445bb0438a964cc894..439530ada1f477ab0edbf34a78132d27d7c496fd 100644 (file)
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -130,6 +130,9 @@ sub create_links {
   # build the popup menus
   $form->{taxincluded} = ($form->{id}) ? $form->{taxincluded} : "checked";
 
+  # notes
+  $form->{notes} = $form->{intnotes} unless $form->{notes};
+
   # currencies
   @curr = split(/:/, $form->{currencies});
   chomp $curr[0];