Reconciliation changes. Moving code around, copying Reconciliation to DBObject. Bugsquishes and work on testing.

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

2 files changed, 45 insertions, 7 deletions

diff --git a/scripts/admin.pl b/scripts/admin.pl
index e022cf8f..486dda5f 100644
--- a/scripts/admin.pl
+++ b/scripts/admin.pl
@@ -199,7 +199,7 @@ sub new_group {
     my ($class, $request) = @_;
     
     my $template = LedgerSMB::Template->new( user=>$user, 
-        template=>'Admin/new_group', language=>$user->{language},
+        template=>'Admin/new_group.html', language=>$user->{language},
         format=>'HTML', path=>'UI');
     
     $template->render();
@@ -207,7 +207,7 @@ sub new_group {
 
 sub cancel {
         
-    __default(@_);
+    &mainpage(@_);
 }
 
 sub __default {
@@ -215,14 +215,32 @@ sub __default {
     my ($request) = @_;
     
     my $template;
+    
+    
+}
+
+sub mainpage {
+    
+    my ($request) = @_;
+    
+    my $template;
+    
+    # We need to test for a login here first.
+    
+    
+    
     my $user = LedgerSMB::DBObject::User->new(base=>$request, copy=>'all');
     
-    $user->get_all_users();
+    my $ret = $user->get_all_users();
     
-    $template = LedgerSMB::Template->new( user=>$user, 
-            template=>'Admin/main', language=>$user->{language},
-            format=>'HTML', path=>'UI');
-    $template->render($user);
+    $template = LedgerSMB::Template->new( 
+        user=>$user, 
+        template=>'Admin/main.html', 
+        language=>$user->{language},
+        format=>'HTML', 
+        path=>'UI'
+    );
+    $template->render({users=>$ret});
 }
 
 #eval { do "scripts/custom/admin.pl"};
diff --git a/scripts/recon.pl b/scripts/recon.pl
index 705588ed..d1337dbb 100644
--- a/scripts/recon.pl
+++ b/scripts/recon.pl
@@ -401,6 +401,26 @@ sub pending {
     }
 }
 
+sub __default {
+    
+    my ($class, $request) = @_;
+    
+    my $recon = LedgerSMB::DBObject::Reconciliation->new($request, copy=>'all');
+    my $template;
+    
+    $template = LedgerSMB::Template->new(
+        user => $user,
+        template => 'reconciliation/list.html',
+        language => $user->{language},
+        format=>'html'
+    );
+    return $template->render(
+        {
+            reports=>$recon->get_report_list()
+        }
+    );
+}
+
 # eval { do "scripts/custom/Reconciliation.pl" };
 1;