projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
041274e
)
Anreden: SimpleSettings-Controller zum Editieren
author
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Fri, 24 Apr 2020 12:56:32 +0000
(14:56 +0200)
committer
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Mon, 11 May 2020 13:57:44 +0000
(15:57 +0200)
SL/Controller/SimpleSystemSetting.pm
patch
|
blob
|
history
SL/DB/Manager/Greeting.pm
patch
|
blob
|
history
locale/de/all
patch
|
blob
|
history
locale/en/all
patch
|
blob
|
history
menus/user/00-erp.yaml
patch
|
blob
|
history
diff --git
a/SL/Controller/SimpleSystemSetting.pm
b/SL/Controller/SimpleSystemSetting.pm
index
4fec19a
..
f0590a1
100644
(file)
--- a/
SL/Controller/SimpleSystemSetting.pm
+++ b/
SL/Controller/SimpleSystemSetting.pm
@@
-65,6
+65,16
@@
my %supported_types = (
},
},
},
},
+ greeting => {
+ class => 'Greeting',
+ auth => 'config',
+ titles => {
+ list => t8('Greetings'),
+ add => t8('Add greeting'),
+ edit => t8('Edit greeting'),
+ },
+ },
+
language => {
# Make locales.pl happy: $self->render("simple_system_setting/_language_form")
class => 'Language',
language => {
# Make locales.pl happy: $self->render("simple_system_setting/_language_form")
class => 'Language',
diff --git
a/SL/DB/Manager/Greeting.pm
b/SL/DB/Manager/Greeting.pm
index
dfe80db
..
0a8de83
100644
(file)
--- a/
SL/DB/Manager/Greeting.pm
+++ b/
SL/DB/Manager/Greeting.pm
@@
-7,8
+7,17
@@
use strict;
use parent qw(SL::DB::Helper::Manager);
use parent qw(SL::DB::Helper::Manager);
+use SL::DB::Helper::Sorted;
+
sub object_class { 'SL::DB::Greeting' }
__PACKAGE__->make_manager_methods;
sub object_class { 'SL::DB::Greeting' }
__PACKAGE__->make_manager_methods;
+sub _sort_spec {
+ return ( default => [ 'description', 1 ],
+ columns => { SIMPLE => 'ALL',
+ map { ( $_ => "lower(greetings.$_)" ) } qw(description)
+ });
+}
+
1;
1;
diff --git
a/locale/de/all
b/locale/de/all
index
26e1c65
..
51f5989
100755
(executable)
--- a/
locale/de/all
+++ b/
locale/de/all
@@
-205,6
+205,7
@@
$self->{texts} = {
'Add department' => 'Abteilung hinzufügen',
'Add empty line (csv_import)' => 'Leere Zeile einfügen',
'Add function block' => 'Funktionsblock hinzufügen',
'Add department' => 'Abteilung hinzufügen',
'Add empty line (csv_import)' => 'Leere Zeile einfügen',
'Add function block' => 'Funktionsblock hinzufügen',
+ 'Add greeting' => 'Anrede hinzufügen',
'Add headers from last uploaded file (csv_import)' => 'Spalten aus der hochgeladenen Datei einfügen',
'Add invoices' => 'Rechnungen hinzufügen',
'Add language' => 'Sprache hinzufügen',
'Add headers from last uploaded file (csv_import)' => 'Spalten aus der hochgeladenen Datei einfügen',
'Add invoices' => 'Rechnungen hinzufügen',
'Add language' => 'Sprache hinzufügen',
@@
-1203,6
+1204,7
@@
$self->{texts} = {
'Edit department' => 'Abteilung bearbeiten',
'Edit file' => 'Datei bearbeiten',
'Edit general settings' => 'Grundeinstellungen bearbeiten',
'Edit department' => 'Abteilung bearbeiten',
'Edit file' => 'Datei bearbeiten',
'Edit general settings' => 'Grundeinstellungen bearbeiten',
+ 'Edit greeting' => 'Anrede bearbeiten',
'Edit greetings' => 'Anreden bearbeiten',
'Edit language' => 'Sprache bearbeiten',
'Edit note' => 'Notiz bearbeiten',
'Edit greetings' => 'Anreden bearbeiten',
'Edit language' => 'Sprache bearbeiten',
'Edit note' => 'Notiz bearbeiten',
diff --git
a/locale/en/all
b/locale/en/all
index
c16c93a
..
49abaf3
100644
(file)
--- a/
locale/en/all
+++ b/
locale/en/all
@@
-205,6
+205,7
@@
$self->{texts} = {
'Add department' => '',
'Add empty line (csv_import)' => '',
'Add function block' => '',
'Add department' => '',
'Add empty line (csv_import)' => '',
'Add function block' => '',
+ 'Add greeting' => '',
'Add headers from last uploaded file (csv_import)' => '',
'Add invoices' => '',
'Add language' => '',
'Add headers from last uploaded file (csv_import)' => '',
'Add invoices' => '',
'Add language' => '',
@@
-1203,6
+1204,7
@@
$self->{texts} = {
'Edit department' => '',
'Edit file' => '',
'Edit general settings' => '',
'Edit department' => '',
'Edit file' => '',
'Edit general settings' => '',
+ 'Edit greeting' => '',
'Edit greetings' => '',
'Edit language' => '',
'Edit note' => '',
'Edit greetings' => '',
'Edit language' => '',
'Edit note' => '',
diff --git
a/menus/user/00-erp.yaml
b/menus/user/00-erp.yaml
index
3486fa6
..
a9a828d
100644
(file)
--- a/
menus/user/00-erp.yaml
+++ b/
menus/user/00-erp.yaml
@@
-1161,6
+1161,13
@@
params:
action: SimpleSystemSetting/list
type: price_factor
params:
action: SimpleSystemSetting/list
type: price_factor
+- parent: system
+ id: system_greetings
+ name: Greetings
+ order: 1250
+ params:
+ action: SimpleSystemSetting/list
+ type: greeting
- parent: system
id: system_departments
name: Departments
- parent: system
id: system_departments
name: Departments