projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
js-Validator: Kommentar-Update
[kivitendo-erp.git]
/
SL
/
Controller
/
DeliveryPlan.pm
diff --git
a/SL/Controller/DeliveryPlan.pm
b/SL/Controller/DeliveryPlan.pm
index
6e6eed4
..
4a45863
100644
(file)
--- a/
SL/Controller/DeliveryPlan.pm
+++ b/
SL/Controller/DeliveryPlan.pm
@@
-15,7
+15,6
@@
use SL::DBUtils ();
use Carp;
use Rose::Object::MakeMethods::Generic (
use Carp;
use Rose::Object::MakeMethods::Generic (
- scalar => [ qw(db_args flat_filter) ],
'scalar --get_set_init' => [ qw(models all_edit_right vc use_linked_items all_employees all_businesses all_departments) ],
);
'scalar --get_set_init' => [ qw(models all_edit_right vc use_linked_items all_employees all_businesses all_departments) ],
);
@@
-339,7
+338,7
@@
sub init_models {
}
sub init_all_edit_right {
}
sub init_all_edit_right {
- $::auth->assert('sales_all_edit', 1)
+ return $_[0]->vc eq 'customer' ? $::auth->assert('sales_all_edit', 1) : $::auth->assert('purchase_all_edit', 1);
}
sub init_vc {
return $::form->{vc} if ($::form->{vc} eq 'customer' || $::form->{vc} eq 'vendor') || croak "self (DeliveryPlan) has no vc defined";
}
sub init_vc {
return $::form->{vc} if ($::form->{vc} eq 'customer' || $::form->{vc} eq 'vendor') || croak "self (DeliveryPlan) has no vc defined";
@@
-369,7
+368,11
@@
sub link_to {
my $vc = $object->is_sales ? 'customer' : 'vendor';
my $id = $object->id;
my $vc = $object->is_sales ? 'customer' : 'vendor';
my $id = $object->id;
- return "oe.pl?action=$action&type=$type&vc=$vc&id=$id";
+ if ($::instance_conf->get_feature_experimental_order) {
+ return "controller.pl?action=Order/$action&type=$type&id=$id";
+ } else {
+ return "oe.pl?action=$action&type=$type&vc=$vc&id=$id";
+ }
}
if ($object->isa('SL::DB::Part')) {
my $id = $object->id;
}
if ($object->isa('SL::DB::Part')) {
my $id = $object->id;