From eb9291da8005a57ecff6f3c2a93a2bf9b6079d37 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20B=C3=BCren?= <jan@lx-office-hosting.de>
Date: Wed, 12 Oct 2011 14:42:49 +0200
Subject: [PATCH] =?utf8?q?Kosten-=20und=20Erfolgstellen=20zu=20unterscheid?=
=?utf8?q?en=20macht(e)=20mittlerweile=20keinen=20Sinn=20mehr,=20da=20man?=
=?utf8?q?=20ja=20entsprechend=20Kosten=20als=20Erfolg=20auf=20eine=20Kost?=
=?utf8?q?enstelle=20buchen=20m=C3=B6chte.=20Ferner=20wird=20auch=20die=20?=
=?utf8?q?Auswahlliste=20schon=20l=C3=A4nger=20nicht=20mehr=20unterschiede?=
=?utf8?q?n.=20Entsprechend=20die=20letzten=20Rudimente=20in=20der=20Form.?=
=?utf8?q?pm=20entfernt=20und=20das=20Datenmodell=20f=C3=BCr=20Rose=20ange?=
=?utf8?q?passt,=20sowie=20nat=C3=BCrlich=20die=20Tabelle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
SL/Controller/Department.pm | 2 --
SL/DB/MetaSetup/Department.pm | 3 ---
SL/Form.pm | 14 --------------
sql/Pg-upgrade2/department_drop_role.sql | 8 ++++++++
templates/webpages/department/form.html | 14 --------------
templates/webpages/department/list.html | 4 ----
6 files changed, 8 insertions(+), 37 deletions(-)
create mode 100644 sql/Pg-upgrade2/department_drop_role.sql
diff --git a/SL/Controller/Department.pm b/SL/Controller/Department.pm
index d1ba94239..03d3fb676 100644
--- a/SL/Controller/Department.pm
+++ b/SL/Controller/Department.pm
@@ -30,7 +30,6 @@ sub action_list {
sub action_new {
my ($self) = @_;
- $self->{department} = SL::DB::Department->new(role => 'P');
$self->render('department/form', title => $::locale->text('Create a new department'));
}
@@ -89,7 +88,6 @@ sub create_or_update {
$self->render('department/form', title => $is_new ? $::locale->text('Create a new department') : $::locale->text('Edit department'));
return;
}
-
$self->{department}->save;
flash_later('info', $is_new ? $::locale->text('The department has been created.') : $::locale->text('The department has been saved.'));
diff --git a/SL/DB/MetaSetup/Department.pm b/SL/DB/MetaSetup/Department.pm
index 1d1d95709..93aa92cdc 100644
--- a/SL/DB/MetaSetup/Department.pm
+++ b/SL/DB/MetaSetup/Department.pm
@@ -12,14 +12,11 @@ __PACKAGE__->meta->setup(
columns => [
id => { type => 'integer', not_null => 1, sequence => 'id' },
description => { type => 'text' },
- role => { type => 'character', default => 'P', length => 1 },
itime => { type => 'timestamp', default => 'now()' },
mtime => { type => 'timestamp' },
],
primary_key_columns => [ 'id' ],
-
- allow_inline_column_values => 1,
);
1;
diff --git a/SL/Form.pm b/SL/Form.pm
index b21f94c71..85ba6f0e0 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2757,20 +2757,12 @@ sub all_vc {
@{ $self->{all_employees} } =
sort { $a->{name} cmp $b->{name} } @{ $self->{all_employees} };
- if ($module eq 'AR') {
# prepare query for departments
$query = qq|SELECT id, description
FROM department
- WHERE role = 'P'
ORDER BY description|;
- } else {
- $query = qq|SELECT id, description
- FROM department
- ORDER BY description|;
- }
-
$self->{all_departments} = selectall_hashref_query($self, $dbh, $query);
# get languages
@@ -2840,15 +2832,9 @@ sub all_departments {
my ($self, $myconfig, $table) = @_;
my $dbh = $self->get_standard_dbh($myconfig);
- my $where;
-
- if ($table eq 'customer') {
- $where = "WHERE role = 'P' ";
- }
my $query = qq|SELECT id, description
FROM department
- $where
ORDER BY description|;
$self->{all_departments} = selectall_hashref_query($self, $dbh, $query);
diff --git a/sql/Pg-upgrade2/department_drop_role.sql b/sql/Pg-upgrade2/department_drop_role.sql
new file mode 100644
index 000000000..5a0ceb530
--- /dev/null
+++ b/sql/Pg-upgrade2/department_drop_role.sql
@@ -0,0 +1,8 @@
+-- @tag: department_drop_role
+-- @description: Kosten- und Erfolgstellen zu unterscheiden, macht(e) mittlerweile keinen Sinn mehr, da man ja entsprechend Kosten als Erfolg auf eine Kostenstelle buchen möchte. Ferner wird auch die Auswahlliste schon länger nicht mehr unterschieden
+-- @depends: release_2_6_3
+-- @charset: utf-8
+-- @ignore: 0
+
+
+ALTER TABLE department DROP COLUMN role;
diff --git a/templates/webpages/department/form.html b/templates/webpages/department/form.html
index 2dc0dd9d8..d009ea0c3 100644
--- a/templates/webpages/department/form.html
+++ b/templates/webpages/department/form.html
@@ -12,20 +12,6 @@
<td>[%- 'Description' | $T8 %]</td>
<td>[% L.input_tag("department.description", SELF.department.description) %]</td>
</tr>
-
- <tr>
- <td valign="top">[%- 'Type' | $T8 %]</td>
- <td valign="top">
- [%- IF is_used %]
- [% L.hidden_tag("role", SELF.department.role) %]
- [%- IF SELF.department.role == "C" %][%- LxERP.t8('Cost Center') %][%- ELSE %][%- LxERP.t8('Profit Center') %][%- END %]
- [%- ELSE %]
- [% L.radio_button_tag("department.role", "value", "C", "label", LxERP.t8("Cost Center"), "checked", SELF.department.role == "C") %]
- <br>
- [% L.radio_button_tag("department.role", "value", "P", "label", LxERP.t8("Profit Center"), "checked", SELF.department.role == "P") %]
- [%- END %]
- </td>
- </tr>
</table>
<p>
diff --git a/templates/webpages/department/list.html b/templates/webpages/department/list.html
index 059aa33b0..7433aa95a 100644
--- a/templates/webpages/department/list.html
+++ b/templates/webpages/department/list.html
@@ -16,8 +16,6 @@
<thead>
<tr class="listheading">
<th width="100%">[%- 'Description' | $T8 %]</th>
- <th>[%- 'Cost Center' | $T8 %]</th>
- <th>[%- 'Profit Center' | $T8 %]</th>
</tr>
</thead>
@@ -29,8 +27,6 @@
[%- HTML.escape(department.description) %]
</a>
</td>
- <td align="center">[%- IF department.role == 'C' %]X[%- END %]</td>
- <td align="center">[%- IF department.role == 'P' %]X[%- END %]</td>
</tr>
[%- END %]
</tbody>
--
2.20.1