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

diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index fff11ca3a99b494a516f1c2ad35ce1091dae64e2..d80fca16d71d99d729c27b26c58cea522545eb55 100644 (file)
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -65,6 +65,7 @@ sub render {
 
   my %params = ( %locals,
                  AUTH     => $::auth,
+                 FLASH    => $::form->{FLASH},
                  FORM     => $::form,
                  LOCALE   => $::locale,
                  LXCONFIG => \%::lx_office_conf,

diff --git a/controller.pl b/controller.pl
new file mode 120000 (symlink)
index 0000000..385000d
--- /dev/null
+++ b/controller.pl
@@ -0,0 +1 @@
+am.pl
\ No newline at end of file