projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ImageUpload: Hochladen deaktivieren wenn Form nicht komplett gefüllt ist
[kivitendo-erp.git]
/
SL
/
FU.pm
diff --git
a/SL/FU.pm
b/SL/FU.pm
index
8a2f269
..
b1eaf00
100644
(file)
--- a/
SL/FU.pm
+++ b/
SL/FU.pm
@@
-246,6
+246,10
@@
sub follow_ups {
$where .= qq| AND (date_trunc('DAY', fu.itime) <= ?)|;
push @values, conv_date($params{itime_to});
}
$where .= qq| AND (date_trunc('DAY', fu.itime) <= ?)|;
push @values, conv_date($params{itime_to});
}
+ if ($params{created_for}) {
+ $where .= qq| AND fu.created_for_user = ?|;
+ push @values, conv_i($params{created_for});
+ }
if ($params{all_users}) {
$where_user = qq|OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?))|;
if ($params{all_users}) {
$where_user = qq|OR (fu.created_by IN (SELECT DISTINCT what FROM follow_up_access WHERE who = ?))|;
@@
-332,8
+336,14
@@
sub link_details {
};
} elsif ($params{trans_type} eq 'sales_quotation') {
};
} elsif ($params{trans_type} eq 'sales_quotation') {
+ my $script = 'oe.pl';
+ my $action = 'edit';
+ if ($::instance_conf->get_feature_experimental_order) {
+ $script = 'controller.pl';
+ $action = 'Order/edit';
+ }
$link = {
$link = {
- 'url' =>
'oe.pl?action=edit
&type=sales_quotation&id=' . $params{trans_id},
+ 'url' =>
$script . '?action=' . $action . '
&type=sales_quotation&id=' . $params{trans_id},
'title' => $locale->text('Sales quotation') . " $params{trans_info}",
};
'title' => $locale->text('Sales quotation') . " $params{trans_info}",
};
@@
-352,8
+362,14
@@
sub link_details {
};
} elsif ($params{trans_type} eq 'sales_order') {
};
} elsif ($params{trans_type} eq 'sales_order') {
+ my $script = 'oe.pl';
+ my $action = 'edit';
+ if ($::instance_conf->get_feature_experimental_order) {
+ $script = 'controller.pl';
+ $action = 'Order/edit';
+ }
$link = {
$link = {
- 'url' =>
'oe.pl?action=edit
&type=sales_order&id=' . $params{trans_id},
+ 'url' =>
$script . '?action=' . $action . '
&type=sales_order&id=' . $params{trans_id},
'title' => $locale->text('Sales Order') . " $params{trans_info}",
};
'title' => $locale->text('Sales Order') . " $params{trans_info}",
};
@@
-363,6
+379,12
@@
sub link_details {
'title' => $locale->text('Sales Invoice') . " $params{trans_info}",
};
'title' => $locale->text('Sales Invoice') . " $params{trans_info}",
};
+ } elsif ($params{trans_type} eq 'purchase_invoice') {
+ $link = {
+ 'url' => 'ir.pl?action=edit&type=purchase_invoice&id=' . $params{trans_id},
+ 'title' => $locale->text('Purchase Invoice') . " $params{trans_info}",
+ };
+
} elsif ($params{trans_type} eq 'credit_note') {
$link = {
'url' => 'is.pl?action=edit&type=credit_note&id=' . $params{trans_id},
} elsif ($params{trans_type} eq 'credit_note') {
$link = {
'url' => 'is.pl?action=edit&type=credit_note&id=' . $params{trans_id},
@@
-376,14
+398,26
@@
sub link_details {
};
} elsif ($params{trans_type} eq 'request_quotation') {
};
} elsif ($params{trans_type} eq 'request_quotation') {
+ my $script = 'oe.pl';
+ my $action = 'edit';
+ if ($::instance_conf->get_feature_experimental_order) {
+ $script = 'controller.pl';
+ $action = 'Order/edit';
+ }
$link = {
$link = {
- 'url' =>
'oe.pl?action=edit
&type=request_quotation&id=' . $params{trans_id},
+ 'url' =>
$script . '?action=' . $action . '
&type=request_quotation&id=' . $params{trans_id},
'title' => $locale->text('Request quotation') . " $params{trans_info}",
};
} elsif ($params{trans_type} eq 'purchase_order') {
'title' => $locale->text('Request quotation') . " $params{trans_info}",
};
} elsif ($params{trans_type} eq 'purchase_order') {
+ my $script = 'oe.pl';
+ my $action = 'edit';
+ if ($::instance_conf->get_feature_experimental_order) {
+ $script = 'controller.pl';
+ $action = 'Order/edit';
+ }
$link = {
$link = {
- 'url' =>
'oe.pl?action=edit
&type=purchase_order&id=' . $params{trans_id},
+ 'url' =>
$script . '?action=' . $action . '
&type=purchase_order&id=' . $params{trans_id},
'title' => $locale->text('Purchase Order') . " $params{trans_info}",
};
'title' => $locale->text('Purchase Order') . " $params{trans_info}",
};