Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/Controller/CustomVariableConfig.pm b/SL/Controller/CustomVariableConfig.pm
index b366ffb..33c3dec 100644 (file)
--- a/SL/Controller/CustomVariableConfig.pm
+++ b/SL/Controller/CustomVariableConfig.pm
@@ -59,10 +59,13 @@ sub action_new {
 sub show_form {
   my ($self, %params) = @_;
 
-  $self->flags([
-    map { split m/=/, 2 }
+  $self->flags({
+    map { split m/=/, $_, 2 }
     split m/;/, ($self->config->flags || '')
-  ]);
+  });
+
+  $::lxdebug->dump(0, "cflags", $self->config->flags);
+  $::lxdebug->dump(0, "flags", $self->flags);
 
   $self->render('custom_variable_config/form', %params);
 }

diff --git a/css/Mobile/menuv3.css b/css/Mobile/menuv3.css
deleted file mode 120000 (symlink)
index 1bd817a..0000000
--- a/css/Mobile/menuv3.css
+++ /dev/null
@@ -1 +0,0 @@
-../lx-office-erp/menuv3.css
\ No newline at end of file

diff --git a/css/Mobile/tabcontent.css b/css/Mobile/tabcontent.css
deleted file mode 120000 (symlink)
index 487ba3f..0000000
--- a/css/Mobile/tabcontent.css
+++ /dev/null
@@ -1 +0,0 @@
-../lx-office-erp/tabcontent.css
\ No newline at end of file

diff --git a/css/Mobile/ui-lightness b/css/Mobile/ui-lightness
index 9f2cad0..2218301 120000 (symlink)
--- a/css/Mobile/ui-lightness
+++ b/css/Mobile/ui-lightness
@@ -1 +1 @@
-../lx-office-erp/ui-lightness/
\ No newline at end of file
+../ui-lightness
\ No newline at end of file

diff --git a/js/jqModal.js b/js/jqModal.js
deleted file mode 120000 (symlink)
index 4f21805..0000000
--- a/js/jqModal.js
+++ /dev/null
@@ -1 +0,0 @@
-jqModal/jqModal.js
\ No newline at end of file