projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Die Variable "ranking" für Zahlungsbedinungen konnte nirgends konfiguriert werden...
[kivitendo-erp.git]
/
SL
/
OE.pm
diff --git
a/SL/OE.pm
b/SL/OE.pm
index
5a1db0c
..
f662615
100644
(file)
--- a/
SL/OE.pm
+++ b/
SL/OE.pm
@@
-72,10
+72,11
@@
sub transactions {
qq| o.marge_total, o.marge_percent, | .
qq| ex.$rate AS exchangerate, | .
qq| pr.projectnumber AS globalprojectnumber, | .
qq| o.marge_total, o.marge_percent, | .
qq| ex.$rate AS exchangerate, | .
qq| pr.projectnumber AS globalprojectnumber, | .
- qq| e.name AS employee | .
+ qq| e.name AS employee
, s.name AS salesman
| .
qq|FROM oe o | .
qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
qq|FROM oe o | .
qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
+ qq|LEFT JOIN employee s ON (o.salesman_id = s.id) | .
qq|LEFT JOIN exchangerate ex ON (ex.curr = o.curr | .
qq| AND ex.transdate = o.transdate) | .
qq|LEFT JOIN project pr ON (o.globalproject_id = pr.id) | .
qq|LEFT JOIN exchangerate ex ON (ex.curr = o.curr | .
qq| AND ex.transdate = o.transdate) | .
qq|LEFT JOIN project pr ON (o.globalproject_id = pr.id) | .
@@
-109,6
+110,11
@@
sub transactions {
$query .= " AND o.employee_id = ?";
push @values, conv_i($form->{employee_id});
}
$query .= " AND o.employee_id = ?";
push @values, conv_i($form->{employee_id});
}
+
+ if ($form->{salesman_id}) {
+ $query .= " AND o.salesman_id = ?";
+ push @values, conv_i($form->{salesman_id});
+ }
if (!$form->{open} && !$form->{closed}) {
$query .= " AND o.id = 0";
if (!$form->{open} && !$form->{closed}) {
$query .= " AND o.id = 0";
@@
-151,6
+157,7
@@
sub transactions {
"quonumber" => "o.quonumber",
"name" => "ct.name",
"employee" => "e.name",
"quonumber" => "o.quonumber",
"name" => "ct.name",
"employee" => "e.name",
+ "salesman" => "e.name",
"shipvia" => "o.shipvia",
"transaction_description" => "o.transaction_description");
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
"shipvia" => "o.shipvia",
"transaction_description" => "o.transaction_description");
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
@@
-437,7
+444,7
@@
sub save {
# add shipto
$form->{name} = $form->{ $form->{vc} };
# add shipto
$form->{name} = $form->{ $form->{vc} };
- $form->{name} =~ s/--
$form->{"$form->{vc}_id"}
//;
+ $form->{name} =~ s/--
\Q$form->{"$form->{vc}_id"}\E
//;
if (!$form->{shipto_id}) {
$form->add_shipto($dbh, $form->{id}, "OE");
if (!$form->{shipto_id}) {
$form->add_shipto($dbh, $form->{id}, "OE");
@@
-817,7
+824,7
@@
sub retrieve {
$ptr->{accno} = $i;
}
$ref->{taxaccounts} .= "$ptr->{accno} ";
$ptr->{accno} = $i;
}
$ref->{taxaccounts} .= "$ptr->{accno} ";
- if (!($form->{taxaccounts} =~ /
$ptr->{accno}
/)) {
+ if (!($form->{taxaccounts} =~ /
\Q$ptr->{accno}\E
/)) {
$form->{"$ptr->{accno}_rate"} = $ptr->{rate};
$form->{"$ptr->{accno}_description"} = $ptr->{taxdescription};
$form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber};
$form->{"$ptr->{accno}_rate"} = $ptr->{rate};
$form->{"$ptr->{accno}_description"} = $ptr->{taxdescription};
$form->{"$ptr->{accno}_taxnumber"} = $ptr->{taxnumber};