projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auth: DBUtils nicht den namespace vollmüllen lassen
[kivitendo-erp.git]
/
SL
/
Controller
/
PaymentTerm.pm
diff --git
a/SL/Controller/PaymentTerm.pm
b/SL/Controller/PaymentTerm.pm
index
631428e
..
5064f75
100644
(file)
--- a/
SL/Controller/PaymentTerm.pm
+++ b/
SL/Controller/PaymentTerm.pm
@@
-13,8
+13,10
@@
use Rose::Object::MakeMethods::Generic
scalar => [ qw(payment_term languages) ],
);
scalar => [ qw(payment_term languages) ],
);
-__PACKAGE__->run_before('load_payment_term', only => [ qw( edit update destroy move_up move_down) ]);
+__PACKAGE__->run_before('check_auth');
+__PACKAGE__->run_before('load_payment_term', only => [ qw( edit update destroy) ]);
__PACKAGE__->run_before('load_languages', only => [ qw(new list edit create update) ]);
__PACKAGE__->run_before('load_languages', only => [ qw(new list edit create update) ]);
+__PACKAGE__->run_before('setup', only => [ qw(new edit) ]);
#
# actions
#
# actions
@@
-24,19
+26,20
@@
sub action_list {
my ($self) = @_;
$self->render('payment_term/list',
my ($self) = @_;
$self->render('payment_term/list',
- title
=> $::locale->text('Payment terms'),
+ title => $::locale->text('Payment terms'),
PAYMENT_TERMS => SL::DB::Manager::PaymentTerm->get_all_sorted);
}
sub action_new {
my ($self) = @_;
PAYMENT_TERMS => SL::DB::Manager::PaymentTerm->get_all_sorted);
}
sub action_new {
my ($self) = @_;
- $self->{payment_term} = SL::DB::PaymentTerm->new;
+ $self->{payment_term} = SL::DB::PaymentTerm->new
(auto_calculation => 1)
;
$self->render('payment_term/form', title => $::locale->text('Create a new payment term'));
}
sub action_edit {
my ($self) = @_;
$self->render('payment_term/form', title => $::locale->text('Create a new payment term'));
}
sub action_edit {
my ($self) = @_;
+
$self->render('payment_term/form', title => $::locale->text('Edit payment term'));
}
$self->render('payment_term/form', title => $::locale->text('Edit payment term'));
}
@@
-64,16
+67,24
@@
sub action_destroy {
$self->redirect_to(action => 'list');
}
$self->redirect_to(action => 'list');
}
-sub action_
move_up
{
+sub action_
reorder
{
my ($self) = @_;
my ($self) = @_;
- $self->{payment_term}->move_position_up;
- $self->redirect_to(action => 'list');
+
+ SL::DB::PaymentTerm->reorder_list(@{ $::form->{payment_term_id} || [] });
+
+ $self->render(\'', { type => 'json' });
}
}
-sub action_move_down {
- my ($self) = @_;
- $self->{payment_term}->move_position_down;
- $self->redirect_to(action => 'list');
+#
+# filters
+#
+
+sub check_auth {
+ $::auth->assert('config');
+}
+
+sub setup {
+ $::request->layout->use_javascript("kivi.PaymentTerm.js");
}
#
}
#
@@
-86,6
+97,7
@@
sub create_or_update {
my $params = delete($::form->{payment_term}) || { };
$self->{payment_term}->assign_attributes(%{ $params });
my $params = delete($::form->{payment_term}) || { };
$self->{payment_term}->assign_attributes(%{ $params });
+ $self->{payment_term}->terms_netto(0) if !$self->{payment_term}->auto_calculation;
my @errors = $self->{payment_term}->validate;
my @errors = $self->{payment_term}->validate;