Merge branch 'master' of http://wagnertech.de/git/mfinanz

[mfinanz.git] / SL / Controller / SimpleSystemSetting.pm

diff --git a/SL/Controller/SimpleSystemSetting.pm b/SL/Controller/SimpleSystemSetting.pm
index f23edbfd9b7f9159fbc2f7bcc5959db98005c0d1..987a07b2d8594173666c2177cf8f33501a48d8b6 100644 (file)
--- a/SL/Controller/SimpleSystemSetting.pm
+++ b/SL/Controller/SimpleSystemSetting.pm
@@ -32,10 +32,12 @@ my %supported_types = (
     list_attributes => [
       { method => 'name',                                      title => t8('Name'), },
       { method => 'iban',                                      title => t8('IBAN'), },
+      { method => 'qr_iban',                                   title => t8('QR-IBAN (Swiss)'), },
       { method => 'bank',                                      title => t8('Bank'), },
       { method => 'bank_code',                                 title => t8('Bank code'), },
       { method => 'bank_account_id',                           title => t8('Bank Account Id Number (Swiss)'), },
       { method => 'bic',                                       title => t8('BIC'), },
+      {                                                        title => t8('Use with bank import'), formatter => sub { $_[0]->use_with_bank_import ? t8('yes') : t8('no') } },
       {                                                        title => t8('Use for Factur-X/ZUGFeRD'), formatter => sub { $_[0]->use_for_zugferd ? t8('yes') : t8('no') } },
       {                                                        title => t8('Use for Swiss QR-Bill'), formatter => sub { $_[0]->use_for_qrbill ? t8('yes') : t8('no') } },
       { method => 'reconciliation_starting_date_as_date',      title => t8('Date'),    align => 'right' },
@@ -175,6 +177,21 @@ my %supported_types = (
     ],
   },
 
+  order_status => {
+    # Make locales.pl happy: $self->render("simple_system_setting/_order_status_form")
+    class  => 'OrderStatus',
+    titles => {
+      list => t8('RFQ/Order Statuses'),
+      add  => t8('Add rfq/order status'),
+      edit => t8('Edit rfq/order status'),
+    },
+    list_attributes => [
+      { method => 'name',        title => t8('Name') },
+      { method => 'description', title => t8('Description') },
+      { method => 'obsolete',    title => t8('Obsolete'), formatter => sub { $_[0]->obsolete ? t8('yes') : t8('no') } },
+    ],
+  },
+
   project_status => {
     class  => 'ProjectStatus',
     titles => {
@@ -373,7 +390,7 @@ sub check_type_and_auth {
 }
 
 sub setup_javascript {
-  $::request->layout->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->layout->use_javascript("${_}.js") for qw();
 }
 
 sub init_class               { "SL::DB::"          . $_[0]->config->{class}                  }