Revision 90bb521a
Von Moritz Bunkus vor mehr als 11 Jahren hinzugefügt
| SL/OE.pm | ||
|---|---|---|
| 853 | 853 |
map { $form->{$_} =~ s/ +$//g } qw(printed emailed queued);
|
| 854 | 854 |
} # if !@ids |
| 855 | 855 |
|
| 856 |
my %oid = ('Pg' => 'oid',
|
|
| 857 |
'Oracle' => 'rowid'); |
|
| 858 |
|
|
| 859 | 856 |
my $transdate = $form->{transdate} ? $dbh->quote($form->{transdate}) : "current_date";
|
| 860 | 857 |
|
| 861 | 858 |
$form->{taxzone_id} = 0 unless ($form->{taxzone_id});
|
| ... | ... | |
| 887 | 884 |
($form->{id}
|
| 888 | 885 |
? qq|WHERE o.trans_id = ?| |
| 889 | 886 |
: qq|WHERE o.trans_id IN (| . join(", ", map("?", @ids)) . qq|)|) .
|
| 890 |
qq|ORDER BY o.$oid{$myconfig->{dbdriver}}|;
|
|
| 887 |
qq|ORDER BY o.oid|;
|
|
| 891 | 888 |
|
| 892 | 889 |
@ids = $form->{id} ? ($form->{id}) : @ids;
|
| 893 | 890 |
$sth = prepare_execute_query($form, $dbh, $query, @values); |
| ... | ... | |
| 1055 | 1052 |
my $tax_rate; |
| 1056 | 1053 |
my $taxamount; |
| 1057 | 1054 |
|
| 1058 |
|
|
| 1059 |
my %oid = ('Pg' => 'oid',
|
|
| 1060 |
'Oracle' => 'rowid'); |
|
| 1061 |
|
|
| 1062 | 1055 |
my (@project_ids, %projectnumbers, %projectdescriptions); |
| 1063 | 1056 |
|
| 1064 | 1057 |
push(@project_ids, $form->{"globalproject_id"}) if ($form->{"globalproject_id"});
|
| ... | ... | |
| 1277 | 1270 |
# get parts and push them onto the stack |
| 1278 | 1271 |
my $sortorder = ""; |
| 1279 | 1272 |
if ($form->{groupitems}) {
|
| 1280 |
$sortorder = qq|ORDER BY pg.partsgroup, a.$oid{$myconfig->{dbdriver}}|;
|
|
| 1273 |
$sortorder = qq|ORDER BY pg.partsgroup, a.oid|;
|
|
| 1281 | 1274 |
} else {
|
| 1282 |
$sortorder = qq|ORDER BY a.$oid{$myconfig->{dbdriver}}|;
|
|
| 1275 |
$sortorder = qq|ORDER BY a.oid|;
|
|
| 1283 | 1276 |
} |
| 1284 | 1277 |
|
| 1285 | 1278 |
$query = qq|SELECT p.partnumber, p.description, p.unit, a.qty, | . |
Auch abrufbar als: Unified diff
Alle Vorkommen von dbdriver, sid, Oracle entfernt
...und gegen das hardcodierte Werte für PostgreSQL ersetzt.