projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In den Benutzereinstellungen klarer machen, dass das XUL-MenĂ¼ nur mit Firefox funktio...
[kivitendo-erp.git]
/
SL
/
DO.pm
diff --git
a/SL/DO.pm
b/SL/DO.pm
index
eea2372
..
28eb854
100644
(file)
--- a/
SL/DO.pm
+++ b/
SL/DO.pm
@@
-142,12
+142,13
@@
sub transactions {
"transaction_description" => "dord.transaction_description"
);
"transaction_description" => "dord.transaction_description"
);
- my $sortoder = "dord.id";
+ my $sortdir = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';
+ my $sortorder = "dord.id";
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
$sortorder = $allowed_sort_columns{$form->{sort}};
}
if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
$sortorder = $allowed_sort_columns{$form->{sort}};
}
- $query .= qq| ORDER by | . $sortorder;
+ $query .= qq| ORDER by | . $sortorder
. " $sortdir"
;
$form->{DO} = selectall_hashref_query($form, $dbh, $query, @values);
$form->{DO} = selectall_hashref_query($form, $dbh, $query, @values);
@@
-345,7
+346,7
@@
sub save {
# Link this delivery order to the quotations it was created from.
RecordLinks->create_links('dbh' => $dbh,
# Link this delivery order to the quotations it was created from.
RecordLinks->create_links('dbh' => $dbh,
- 'mode' => '
string
',
+ 'mode' => '
ids
',
'from_table' => 'oe',
'from_ids' => $form->{convert_from_oe_ids},
'to_table' => 'delivery_orders',
'from_table' => 'oe',
'from_ids' => $form->{convert_from_oe_ids},
'to_table' => 'delivery_orders',
@@
-388,13
+389,11
@@
sub mark_orders_if_delivered {
my ($oe_id) = $links[0]->{from_id} if (scalar @links);
my ($oe_id) = $links[0]->{from_id} if (scalar @links);
- $main::lxdebug->message(0, "oe_id $oe_id");
-
return $main::lxdebug->leave_sub() if (!$oe_id);
my $all_units = AM->retrieve_all_units();
return $main::lxdebug->leave_sub() if (!$oe_id);
my $all_units = AM->retrieve_all_units();
-
$query
= qq|SELECT oi.parts_id, oi.qty, oi.unit, p.unit AS partunit
+
my $query
= qq|SELECT oi.parts_id, oi.qty, oi.unit, p.unit AS partunit
FROM orderitems oi
LEFT JOIN parts p ON (oi.parts_id = p.id)
WHERE (oi.trans_id = ?)|;
FROM orderitems oi
LEFT JOIN parts p ON (oi.parts_id = p.id)
WHERE (oi.trans_id = ?)|;
@@
-404,8
+403,6
@@
sub mark_orders_if_delivered {
'oe_id' => $oe_id,);
my %ordered = ();
'oe_id' => $oe_id,);
my %ordered = ();
- do_statement($form, $sth, $query, $oe_id);
-
while (my $ref = $sth->fetchrow_hashref()) {
$ref->{baseqty} = $ref->{qty} * $all_units->{$ref->{unit}}->{factor} / $all_units->{$ref->{partunit}}->{factor};
while (my $ref = $sth->fetchrow_hashref()) {
$ref->{baseqty} = $ref->{qty} * $all_units->{$ref->{unit}}->{factor} / $all_units->{$ref->{partunit}}->{factor};