Making account numbers clickable on customer/vendor screen, correcting contact editing population (needs a little more work there), and adding control code search

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2285 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 32 insertions, 17 deletions

diff --git a/UI/Contact/contact.html b/UI/Contact/contact.html
index ff9cdae1..3bf7f1a3 100644
--- a/UI/Contact/contact.html
+++ b/UI/Contact/contact.html
@@ -161,17 +161,17 @@ problems with multi-word single-quoted constructs in PI tags. -CT  -->
 		value = account_class
 	} ?>	
 	<?lsmb PROCESS input element_data = {
-		label = text('Control Code:'), #'
-		type= "text",
-		name = "control_code",
-		value = control_code,
+		label = text('Control Code:') #'
+		type= "text"
+		name = "control_code"
+		value = control_code
 		size = "20"
 	} ?><br/>
 	<?lsmb PROCESS input element_data = {
-		label = text('Name:'),
-		type= "text",
-		name = "name",
-		value = name,
+		label = text('Name:')
+		type= "text"
+		name = "name"
+		value = name
 		size = "20"
 	} ?><br/>
         <table>
@@ -231,7 +231,9 @@ problems with multi-word single-quoted constructs in PI tags. -CT  -->
             <?lsmb ELSIF cl_item.entity_class == 2 ?><?lsmb text('Customer') ?>
             <?lsmb END ?>
         </td>
-        <td><?lsmb cl_item.meta_number ?></td>
+        <td><a href="<?lsmb script ?>?action=get&account_class=<?lsmb 
+		account_class ?>&entity_id=<?lsmb entity_id 
+		?>&meta_number=<?lsmb cl_item.meta_number ?>"><?lsmb cl_item.meta_number ?></a></td>
         <td><?lsmb cl_item.credit_limit ?></td>
         <td><?lsmb cl_item.start_date ?></td>
         <td><?lsmb cl_item.end_date ?></td>
@@ -589,7 +591,9 @@ problems with multi-word single-quoted constructs in PI tags. -CT  -->
 		<td class="contact"><?lsmb ct.contact ?></td>
 		<td class="contact_actions">
 			<a href="<?lsmb script ?>?entity_id=<?lsmb entity_id 
-				?>&contact_id=<?lsmb ct.id 
+				?>&contact=<?lsmb ct.contact 
+				?>&contact_class=<?lsmb ct.class_id
+				?>&description=<?lsmb ct.description 
 				?>&action=edit&credit_id=<?lsmb 
 				credit_id ?>"
 			>[<?lsmb text('Edit'); ?>]</a>&nbsp;&nbsp;
@@ -618,13 +622,15 @@ problems with multi-word single-quoted constructs in PI tags. -CT  -->
 		name="contact_id" 
 		value=contact_id
 	} ?>
-	<div><label for="contact_type"><?lsmb text('Type:') ?></label>
-		<select name="contact_class" id="contact_type">
-		<?lsmb FOREACH cc = contact_class_list ?>
-		<option value="<?lsmb cc.id ?>"><?lsmb cc.class ?></option>
-		<?lsmb END ?>
-		</select>
-		<!-- TODO:  Move the above select list to elements.html -CT -->
+	<div>
+		<?lsmb PROCESS select element_data = {
+			name = "contact_class"
+			label = "Type"
+			text_attr = "class"
+			value_attr = "id"
+			default_values = [contact_class]		
+			options = contact_class_list
+		} ?>
 	</div>
 	<div>
 		<?lsmb PROCESS input element_data = {
diff --git a/UI/Contact/search.html b/UI/Contact/search.html
index bf6207a7..e90d6564 100644
--- a/UI/Contact/search.html
+++ b/UI/Contact/search.html
@@ -30,6 +30,15 @@
                 <th align="right"><?lsmb text('Company Name') ?></th>
                 <td><?lsmb INCLUDE input element_data={size = '32', name = 'legal_name'} ?></td>
               </tr>
+             <tr>
+                <th align="right"><?lsmb text('Control Code') ?></th>
+		<td><?lsmb PROCESS input element_data = {
+			size = 32
+			name = "control_code"
+			type = "text"
+			value = control_code
+			} ?></td>
+             </tr>
               <tr>
                 <th align="right"><?lsmb text('Contact') ?></th>
                 <td><?lsmb INCLUDE input element_data={size = '32', name = 'contact'} ?></td>