From 089001124dbd8016d5d51f9aaef50fb9f101dae5 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 1 Mar 2010 22:18:11 +0000
Subject: [PATCH] fixup editing w/manual inventory, RT#7010

---
 httemplate/edit/elements/svc_Common.html | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index 0ffb4319f..453d07f88 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -65,15 +65,20 @@
                    } elsif ( $flag eq 'A' ) {
                      $f->{'type'} = 'hidden';
                    } elsif ( $flag eq 'M' ) {
-                     $f->{'type'}      = 'select-table';
-                     $f->{'table'}     = 'inventory_item';
-                     $f->{'name_col'}  = 'item'; 
-                     $f->{'value_col'} = 'item'; 
-                     $f->{'hashref'}   = {
-                                          'classnum' => $columndef->columnvalue,
-                                          'svcnum'   => '',
-                                         };
                      $f->{'empty_label'} = 'Select inventory item';
+                     $f->{'type'}        = 'select-table';
+                     $f->{'table'}       = 'inventory_item';
+                     $f->{'name_col'}    = 'item'; 
+                     $f->{'value_col'}   = 'item'; 
+                     $f->{'hashref'}     = {
+                                            'classnum'=>$columndef->columnvalue,
+                                            #'svcnum'  => '',
+                                           };
+                     $f->{'extra_sql'}   = 'AND ( svcnum IS NULL ';
+                     $f->{'extra_sql'}  .= ' OR svcnum = '. $object->svcnum
+                       if $object->svcnum;
+                     $f->{'extra_sql'}  .= ' ) ';
+                     $f->{'disable_empty'} = $object->svcnum ? 1 : 0,
                    }
 
                    if ( $f->{'type'} eq 'select-svc_pbx' ) {
-- 
2.11.0