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:
3a83d46
)
Titel von Ansprechpersonen: SimpleSettings-Controller zum Editieren
author
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Fri, 8 May 2020 14:47:13 +0000
(16:47 +0200)
committer
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Mon, 11 May 2020 15:04:20 +0000
(17:04 +0200)
SL/Controller/SimpleSystemSetting.pm
patch
|
blob
|
history
SL/DB/Manager/ContactTitle.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
f0590a1
..
96fe5ed
100644
(file)
--- a/
SL/Controller/SimpleSystemSetting.pm
+++ b/
SL/Controller/SimpleSystemSetting.pm
@@
-56,6
+56,16
@@
my %supported_types = (
],
},
],
},
+ contact_title => {
+ class => 'ContactTitle',
+ auth => 'config',
+ titles => {
+ list => t8('Contact Titles'),
+ add => t8('Add title'),
+ edit => t8('Edit title'),
+ },
+ },
+
department => {
class => 'Department',
titles => {
department => {
class => 'Department',
titles => {
diff --git
a/SL/DB/Manager/ContactTitle.pm
b/SL/DB/Manager/ContactTitle.pm
index
f4119a8
..
dea095d
100644
(file)
--- a/
SL/DB/Manager/ContactTitle.pm
+++ b/
SL/DB/Manager/ContactTitle.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::ContactTitle' }
__PACKAGE__->make_manager_methods;
sub object_class { 'SL::DB::ContactTitle' }
__PACKAGE__->make_manager_methods;
+sub _sort_spec {
+ return ( default => [ 'description', 1 ],
+ columns => { SIMPLE => 'ALL',
+ map { ( $_ => "lower(contact_titles.$_)" ) } qw(description)
+ });
+}
+
1;
1;
diff --git
a/locale/de/all
b/locale/de/all
index
5f05135
..
3c5ec2a
100755
(executable)
--- a/
locale/de/all
+++ b/
locale/de/all
@@
-236,6
+236,7
@@
$self->{texts} = {
'Add sub function block' => 'Unterfunktionsblock hinzufügen',
'Add taxzone' => 'Steuerzone hinzufügen',
'Add text block' => 'Textblock erfassen',
'Add sub function block' => 'Unterfunktionsblock hinzufügen',
'Add taxzone' => 'Steuerzone hinzufügen',
'Add text block' => 'Textblock erfassen',
+ 'Add title' => 'Titel hinzufügen',
'Add unit' => 'Einheit hinzufügen',
'Added sections and function blocks: #1' => 'Hinzugefügte Abschnitte und Funktionsblöcke: #1',
'Added text blocks: #1' => 'Hinzugefügte Textblöcke: #1',
'Add unit' => 'Einheit hinzufügen',
'Added sections and function blocks: #1' => 'Hinzugefügte Abschnitte und Funktionsblöcke: #1',
'Added text blocks: #1' => 'Hinzugefügte Textblöcke: #1',
@@
-669,6
+670,7
@@
$self->{texts} = {
'Contact Person' => 'Ansprechperson',
'Contact Person (database ID)' => 'Ansprechperson (Datenbank-ID)',
'Contact Person (name)' => 'Ansprechperson (Name)',
'Contact Person' => 'Ansprechperson',
'Contact Person (database ID)' => 'Ansprechperson (Datenbank-ID)',
'Contact Person (name)' => 'Ansprechperson (Name)',
+ 'Contact Titles' => 'Titel von Ansprechpersonen',
'Contact deleted.' => 'Ansprechperson gelöscht.',
'Contact is in use and was flagged invalid.' => 'Die Ansprechperson ist noch in Verwendung und wurde deshalb nur als ungültig markiert.',
'Contact person (surname)' => 'Ansprechperson (Nachname)',
'Contact deleted.' => 'Ansprechperson gelöscht.',
'Contact is in use and was flagged invalid.' => 'Die Ansprechperson ist noch in Verwendung und wurde deshalb nur als ungültig markiert.',
'Contact person (surname)' => 'Ansprechperson (Nachname)',
@@
-1244,6
+1246,7
@@
$self->{texts} = {
'Edit the request_quotation' => 'Bearbeiten der Preisanfrage',
'Edit the sales_order' => 'Bearbeiten des Auftrags',
'Edit the sales_quotation' => 'Bearbeiten des Angebots',
'Edit the request_quotation' => 'Bearbeiten der Preisanfrage',
'Edit the sales_order' => 'Bearbeiten des Auftrags',
'Edit the sales_quotation' => 'Bearbeiten des Angebots',
+ 'Edit title' => 'Titiel bearbeiten',
'Edit units' => 'Einheiten bearbeiten',
'Edit user signature' => 'Benutzersignatur bearbeiten',
'Editable' => 'Bearbeitbar',
'Edit units' => 'Einheiten bearbeiten',
'Edit user signature' => 'Benutzersignatur bearbeiten',
'Editable' => 'Bearbeitbar',
diff --git
a/locale/en/all
b/locale/en/all
index
55084c8
..
56561d5
100644
(file)
--- a/
locale/en/all
+++ b/
locale/en/all
@@
-236,6
+236,7
@@
$self->{texts} = {
'Add sub function block' => '',
'Add taxzone' => '',
'Add text block' => '',
'Add sub function block' => '',
'Add taxzone' => '',
'Add text block' => '',
+ 'Add title' => '',
'Add unit' => '',
'Added sections and function blocks: #1' => '',
'Added text blocks: #1' => '',
'Add unit' => '',
'Added sections and function blocks: #1' => '',
'Added text blocks: #1' => '',
@@
-669,6
+670,7
@@
$self->{texts} = {
'Contact Person' => '',
'Contact Person (database ID)' => '',
'Contact Person (name)' => '',
'Contact Person' => '',
'Contact Person (database ID)' => '',
'Contact Person (name)' => '',
+ 'Contact Titles' => '',
'Contact deleted.' => '',
'Contact is in use and was flagged invalid.' => '',
'Contact person (surname)' => '',
'Contact deleted.' => '',
'Contact is in use and was flagged invalid.' => '',
'Contact person (surname)' => '',
@@
-1244,6
+1246,7
@@
$self->{texts} = {
'Edit the request_quotation' => '',
'Edit the sales_order' => '',
'Edit the sales_quotation' => '',
'Edit the request_quotation' => '',
'Edit the sales_order' => '',
'Edit the sales_quotation' => '',
+ 'Edit title' => '',
'Edit units' => '',
'Edit user signature' => '',
'Editable' => '',
'Edit units' => '',
'Edit user signature' => '',
'Editable' => '',
diff --git
a/menus/user/00-erp.yaml
b/menus/user/00-erp.yaml
index
a9a828d
..
068bd69
100644
(file)
--- a/
menus/user/00-erp.yaml
+++ b/
menus/user/00-erp.yaml
@@
-1182,6
+1182,13
@@
params:
action: SimpleSystemSetting/list
type: business
params:
action: SimpleSystemSetting/list
type: business
+- parent: system
+ id: system_contact_titles
+ name: Contact Titles
+ order: 1420
+ params:
+ action: SimpleSystemSetting/list
+ type: contact_title
- parent: system
id: system_project_types
name: Project Types
- parent: system
id: system_project_types
name: Project Types