Further fixes to Reconciliation, the new Admin interface, and a small change to Company.sql

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

2 files changed, 50 insertions, 74 deletions

diff --git a/UI/Admin/edit_user.html b/UI/Admin/edit_user.html
index 4602f8fa..71b86226 100644
--- a/UI/Admin/edit_user.html
+++ b/UI/Admin/edit_user.html
@@ -1,8 +1,8 @@
 <div id="modify_user">
     <font size="15">
         <strong>
-            <?lsmb IF user.username ?>
-                Edit User <?lsmb user.username ?>
+            <?lsmb IF user.user.username ?>
+                Editing User <?lsmb user.user.username ?>
             <?lsmb ELSE?>
                 New User
             <?lsmb END?>
@@ -26,28 +26,28 @@
             <tr>
                 <td>First Name</td>
                 <td>
-                    <input type="textarea" name="first_name" value="<?lsmb user.first_name?>"/>
+                    <input type="textarea" name="first_name" value="<?lsmb user.employee.first_name?>"/>
                 </td>
             </tr>
             
             <tr>
                 <td>Last Name</td>
                 <td>
-                    <input type="textarea" name="last_name" value="<?lsmb user.last_name?>"/>
+                    <input type="textarea" name="last_name" value="<?lsmb user.employee.last_name?>"/>
                 </td>
             </tr>
             <tr>
                 <td>Employee #</td>
                 <td>
-                    <input type="textarea" name="employeenumber" value="<?lsmb user.employeenumber?>"/>
+                    <input type="textarea" name="employeenumber" value="<?lsmb user.employee.employeenumber?>"/>
                 </td>
             </tr>
             <hr/>
-            <?lsmb UNLESS user.username?>
+            <?lsmb UNLESS user.user.username?>
             <tr>
                 <td>Username</td>
                 <td>
-                    <input type="textarea" name="username" value="<?lsmb user.last_name?>"/>
+                    <input type="textarea" name="username" value="<?lsmb user.user.username?>"/>
                 </td>
             </tr>
             <?lsmb END?>
@@ -65,83 +65,63 @@
                     <input type="textarea" name="companyname" value="<?lsmb user.companyname?>"/>
                 </td>
             </tr>
+            
+            
             <tr>
                 <td>
-                    Address 
-                </td>
-                <td>
-                    <input type="textarea" name="address1" value="<?lsmb user.address1?>"/>
-                </td>
-            </tr>
-            <tr>
-                <td></td>
-                <td>
-                    <input type="textarea" name="address2" value="<?lsmb user.address2?>"/>
+                    Address
                 </td>
-            </tr>
-            <tr>
-                <td></td>
                 <td>
-                    <input type="textarea" name="address3" value="<?lsmb user.address3?>"/>
+                    City
                 </td>
-            </tr>
-            <tr>
-                <td>City</td>
                 <td>
-                    <input type="textarea" name="city" value="<?lsmb user.city?>"/>
+                    State/Province
                 </td>
-            </tr>
-            <tr>
-                <td>City</td>
                 <td>
-                    <input type="textarea" name="city" value="<?lsmb user.city?>"/>
+                    Zip/Postal Code
                 </td>
-            </tr>
-            <tr>
-                <td>State/Province</td>
                 <td>
-                    <input type="textarea" name="state" value="<?lsmb user.state?>"/>
+                    Country
                 </td>
             </tr>
             
-            <tr>
-                <td>Zip/Postal code</td>
-                <td>
-                    <input type="textarea" name="zipcode" value="<?lsmb user.zipcode?>"/>
-                </td>
-            </tr>
-            <tr>
-                <td>Country</td>
-                <td>
-                    <input type="textarea" name="country" value="<?lsmb user.city?>"/>
-                </td>
-            </tr>
+            <?lsmb FOR location IN user.locations ?>
+                
+                <tr>
+                    <td>
+                        <input type="textarea" name="address1" value="<?lsmb location.lineone?>"/>    
+                        <input type="textarea" name="address2" value="<?lsmb location.linetwo?>"/>
+                        <input type="textarea" name="address3" value="<?lsmb location.linethree?>"/>
+                    </td>
+                    <td>
+                        <input type="textarea" name="city" value="<?lsmb location.city?>"/>
+                    </td>
+                    <td>
+                        <input type="textarea" name="state" value="<?lsmb location.state?>"/>
+                    </td>
+                    <td>
+                        <input type="textarea" name="zipcode" value="<?lsmb location.zipcode?>"/>
+                    </td>
+                     <td>
+                         <input type="textarea" name="country" value="<?lsmb location.country?>"/>
+                     </td>
+                </tr>
+                
+            <?lsmb END?>
             
+              
             <tr>
                 <td><br/></td>
                 <td><hr/></td>
             </tr>
             
-            <tr>
-                <td>Home Phone</td>
-                <td>
-                    <input type="textarea" name="homephone" value="<?lsmb user.homephone?>"/>
-                </td>
-            </tr>
-            
-            <tr>
-                <td>Work Phone</td>
-                <td>
-                    <input type="textarea" name="workphone" value="<?lsmb user.workphone?>"/>
-                </td>
-            </tr>
-            
-            <tr>
-                <td>Email</td>
-                <td>
-                    <input type="textarea" name="e_mail" value="<?lsmb user.e_mail?>"/>
-                </td>
-            </tr>
+            <?lsmb FOR contact IN user.contacts?>
+                
+                <tr>
+                    <td><?lsmb contact.class?></td>
+                    <td><?lsmb contact.contact?></td>
+                </tr>
+            <?lsmb END?>
             
         </table>
         
@@ -149,12 +129,12 @@
             
             <!-- Groups section -->
             <tr>
-            <?lsmb FOREACH group IN groups ?>
-            <?lsmb IF loop.count % 8 == 0?>
+            <?lsmb FOREACH role IN roles ?>
+            <?lsmb IF loop.count % 2 == 0?>
             </tr>
             <tr>
             <?lsmb END?>
-                <td><input type="checkbox" name="<?lsmb loop.index?>" value="1"/><?lsmb group.rolname?></td>
+                <td><input type="checkbox" name="<?lsmb loop.index?>" value="1"/><?lsmb role?></td>
             <?lsmb END?>
             </tr>
         </table>
diff --git a/UI/Admin/main.html b/UI/Admin/main.html
index 219e70e4..96c90db7 100644
--- a/UI/Admin/main.html
+++ b/UI/Admin/main.html
@@ -13,7 +13,6 @@
     <table>
         <tr>
             <td></td>
-            <td>User ID</td>
             <td>Username</td>
             <td>Active</td>
             <td>Date Added</td>
@@ -24,12 +23,9 @@
         <tr>
             <td></td>
             <td>
-                <a href="admin.pl?action=edit_user&amp;user=<?lsmb user.id?>">
-                    <?lsmb user.id?>
-                </a>
-            </td>
-            <td>
+                <a href="admin.pl?action=edit_user&amp;user_id=<?lsmb user.id?>">
                 <?lsmb user.username?>
+                </a>
             </td>
             <td>
                 <?lsmb user.active?>