projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2922b22
)
fix inventory item search w/customer classes
author
ivan
<ivan>
Sat, 13 Feb 2010 02:16:00 +0000
(
02:16
+0000)
committer
ivan
<ivan>
Sat, 13 Feb 2010 02:16:00 +0000
(
02:16
+0000)
httemplate/search/inventory_item.html
patch
|
blob
|
history
diff --git
a/httemplate/search/inventory_item.html
b/httemplate/search/inventory_item.html
index
cd37e26
..
06b0847
100644
(file)
--- a/
httemplate/search/inventory_item.html
+++ b/
httemplate/search/inventory_item.html
@@
-6,7
+6,7
@@
'query' => {
'table' => 'inventory_item',
'query' => {
'table' => 'inventory_item',
- 'hashref' => {
'classnum' => $classnum
},
+ 'hashref' => {},
'select' => join(', ',
'inventory_item.*',
'cust_main.custnum',
'select' => join(', ',
'inventory_item.*',
'cust_main.custnum',
@@
-79,6
+79,7
@@
die "access denied"
my $classnum = $cgi->param('classnum');
$classnum =~ /^(\d+)$/ or errorpage("illegal classnum $classnum");
$classnum = $1;
my $classnum = $cgi->param('classnum');
$classnum =~ /^(\d+)$/ or errorpage("illegal classnum $classnum");
$classnum = $1;
+my $extra_sql = 'inventory_item.classnum = $classnum ';
my $inventory_class = qsearchs( {
'table' => 'inventory_class',
my $inventory_class = qsearchs( {
'table' => 'inventory_class',
@@
-88,17
+89,16
@@
my $inventory_class = qsearchs( {
my $title = $inventory_class->classname. ' Inventory';
#little false laziness with SQL fragments in inventory_class.pm
my $title = $inventory_class->classname. ' Inventory';
#little false laziness with SQL fragments in inventory_class.pm
-my $extra_sql = '';
if ( $cgi->param('avail') ) {
if ( $cgi->param('avail') ) {
- $extra_sql
= '
AND ( svcnum IS NULL OR svcnum = 0 )';
+ $extra_sql
.= '
AND ( svcnum IS NULL OR svcnum = 0 )';
$title .= ' - Available';
} elsif ( $cgi->param('used') ) {
$title .= ' - Available';
} elsif ( $cgi->param('used') ) {
- $extra_sql
= '
AND svcnum IS NOT NULL AND svcnum > 0';
+ $extra_sql
.= '
AND svcnum IS NOT NULL AND svcnum > 0';
$title .= ' - In use';
}
my $count_query =
$title .= ' - In use';
}
my $count_query =
- "SELECT COUNT(*) FROM inventory_item WHERE
classnum = $classnum
$extra_sql";
+ "SELECT COUNT(*) FROM inventory_item WHERE $extra_sql";
my $link = sub {
my $inventory_item = shift;
my $link = sub {
my $inventory_item = shift;