[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[2225] trunk/scripts
- Subject: SF.net SVN: ledger-smb:[2225] trunk/scripts
- From: ..hidden..
- Date: Thu, 31 Jul 2008 17:09:03 +0000
Revision: 2225
http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2225&view=rev
Author: aurynn_cmd
Date: 2008-07-31 17:09:02 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
Reconciliation work, new admin tweaks
Modified Paths:
--------------
trunk/scripts/admin.pl
trunk/scripts/recon.pl
Modified: trunk/scripts/admin.pl
===================================================================
--- trunk/scripts/admin.pl 2008-07-30 20:26:15 UTC (rev 2224)
+++ trunk/scripts/admin.pl 2008-07-31 17:09:02 UTC (rev 2225)
@@ -37,8 +37,10 @@
);
} else {
- my $template = LedgerSMB::Template->new( user => $user,
- template => 'Admin/edit_user', language => $user->{language},
+ my $template = LedgerSMB::Template->new(
+ user => $user,
+ template => 'Admin/edit_user',
+ language => $user->{language},
format => 'HTML', path=>'UI');
$template->render(
@@ -212,11 +214,7 @@
sub __default {
- my ($request) = @_;
-
- my $template;
-
-
+ &mainpage(@_);
}
sub mainpage {
Modified: trunk/scripts/recon.pl
===================================================================
--- trunk/scripts/recon.pl 2008-07-30 20:26:15 UTC (rev 2224)
+++ trunk/scripts/recon.pl 2008-07-31 17:09:02 UTC (rev 2225)
@@ -21,8 +21,10 @@
package LedgerSMB::Scripts::recon;
use LedgerSMB::Template;
-use LedgerSMB::Reconciliation;
+use LedgerSMB::DBObject::Reconciliation;
+use Data::Dumper;
+
=pod
=over
@@ -38,11 +40,12 @@
=cut
sub display_report {
- my ($class, $request) = @_;
+ my ($request) = @_;
my $recon = LedgerSMB::Employee->new(base => $request, copy => 'all');
my $template = LedgerSMB::Template->new( user=>$user,
- template => "reconciliation/report.html", language => $user->{language},
- format=>'html'
+ template => "reconciliation/report", language => $user->{language},
+ format=>'HTML',
+ path=>"UI"
);
my $report = $recon->get_report();
my $total = $recon->get_total();
@@ -69,30 +72,34 @@
=cut
sub search {
- my ($class, $request) = @_;
+ my ($request) = @_;
if ($request->type() eq "POST") {
# WE HAS DATUMS
# INTENTIONAL BAD PLURALIZATION OF LATIN
+
+ my $search = LedgerSMB::DBObject::Reconciliation->new(base => $request, copy => 'all');
+ my $results = $search->search();
+ my $total = $search->total();
+
+
+ my $template = LedgerSMB::Template->new( user => $user,
+ template => 'reconciliation/report', language => $user->{language},
+ format => 'HTML',
+ path=>"UI");
+ return $template->render({report => $results, total => $total});
+
+ } else {
+
my $template = LedgerSMB::Template->new(
user => $user,
- template=>'reconciliation/search.html',
+ template=>'reconciliation/search',
language=>$user->{language},
- format=>'html'
+ format=>'HTML',
+ path=>"UI"
);
return $template->render();
-
- } else {
- my $search = LedgerSMB::Reconciliation->new(base => $request, copy => 'all');
- my $results = $search->search();
- my $total = $search->total();
-
-
- my $template = LedgerSMB::Template->new( user => $user,
- template => 'reconciliation/report.html', language => $user->{language},
- format => 'html');
- return $template->render({report => $results, total => $total});
}
}
@@ -113,7 +120,7 @@
=cut
sub correct {
- my ($class, $request) = @_;
+ my ($request) = @_;
if ($request->type() eq "POST") {
@@ -125,8 +132,9 @@
if ($recon->{corrected_id}) {
my $template = LedgerSMB::Template->new( user => $user,
- template => 'reconciliation/report.html', language => $user->{language},
- format => 'html');
+ template => 'reconciliation/report', language => $user->{language},
+ format => 'HTML',
+ path=>"UI");
$template->render( {
corrected=> $recon->{corrected_id},
@@ -139,8 +147,9 @@
# indicate we were unable to correct this entry, with the error code
# spat back to us by the DB.
my $template = LedgerSMB::Template->new( user => $user,
- template => 'reconciliation/report.html', language => $user->{language},
- format => 'html');
+ template => 'reconciliation/report', language => $user->{language},
+ format => 'HTML',
+ path=>"UI");
$template->render( {
recon => $recon,
@@ -160,9 +169,10 @@
my $template = LedgerSMB::Template->new(
user=>$user,
- template=>"reconciliation/correct.html",
+ template=>"reconciliation/correct",
language=> $user->{language},
- format=>'html'
+ format=>'HTML',
+ path=>"UI"
);
my $recon = LedgerSMB::DBObject::Reconciliation->new(base=>$request, copy=>'all');
@@ -172,9 +182,10 @@
my $template = LedgerSMB::Template->new(
user=>$user,
- template=>"reconciliation/correct.html",
+ template=>"reconciliation/correct",
language=> $user->{language},
- format=>'html'
+ format=>'HTML',
+ path=>"UI"
);
$class->display_report();
}
@@ -199,7 +210,7 @@
=cut
sub new_report {
- my ($class, $request) = @_;
+ my ($request) = @_;
# how are we going to allow this to be created? Grr.
# probably select a list of statements that are available to build
# reconciliation reports with.
@@ -224,18 +235,20 @@
$template = LedgerSMB::Template->new(
user=>$user,
- template=> 'reconciliation/upload.html',
+ template=> 'reconciliation/upload',
language=>$user->{language},
- format=>'html'
+ format=>'HTML',
+ path=>"UI"
);
return $template->render({error=>$recon->error()});
}
$template = LedgerSMB::Template->new(
user=> $user,
- template => 'reconciliation/new_report.html',
+ template => 'reconciliation/new_report',
language => $user->{language},
- format=>'html'
+ format=>'HTML',
+ path=>"UI"
);
return $template->render(
{
@@ -249,9 +262,10 @@
# we can assume we're to generate the "Make a happy new report!" page.
$template = LedgerSMB::Template->new(
user => $user,
- template => 'reconciliation/upload.html',
+ template => 'reconciliation/upload',
language => $user->{language},
- format => 'html'
+ format => 'HTML',
+ path=>"UI"
);
return $template->render();
}
@@ -278,7 +292,7 @@
=cut
sub approve {
- my ($class, $request) = @_;
+ my ($request) = @_;
# Approve will also display the report in a blurred/opaqued out version,
# with the controls removed/disabled, so that we know that it has in fact
@@ -296,8 +310,10 @@
if ($code == 0) {
$template = LedgerSMB::Template->new( user => $user,
- template => 'reconciliation/approve.html', language => $user->{language},
- format => 'html');
+ template => 'reconciliation/approve', language => $user->{language},
+ format => 'HTML',
+ path=>"UI"
+ );
return $template->render();
}
@@ -307,9 +323,11 @@
$template = LedgerSMB::Template->new(
user => $user,
- template => 'reconciliation/report.html',
+ template => 'reconciliation/report',
language => $user->{language},
- format => 'html');
+ format => 'HTML',
+ path=>"UI"
+ );
return $template->render(
{
entries=>$recon->get_report($request->{report_id}),
@@ -339,7 +357,7 @@
=cut
sub corrections {
- my ($class, $request) = @_;
+ my ($request) = @_;
# Load the corrections for a given report & entry id.
# possibly should use a "micro" popup window?
@@ -349,8 +367,8 @@
my $template;
$template = LedgerSMB::Template->new( user => $user,
- template => 'reconciliation/corrected.html', language => $user->{language},
- format => 'html');
+ template => 'reconciliation/corrected', language => $user->{language},
+ format => 'HTML', path=>"UI");
return $template->render(
{
@@ -377,16 +395,17 @@
sub pending {
- my ($class, $request) = @_;
+ my ($request) = @_;
- my $recon = LedgerSMB::DBObject::Reconciliation->new(base=>request, copy=>'all');
+ my $recon = LedgerSMB::DBObject::Reconciliation->new(base=>$request, copy=>'all');
my $template;
$template= LedgerSMB::Template->new(
user => $user,
- template=>'reconciliation/pending.html',
+ template=>'reconciliation/pending',
language=>$user->{language},
- format=>'html'
+ format=>'HTML',
+ path=>"UI"
);
if ($request->type() eq "POST") {
return $template->render(
@@ -403,16 +422,19 @@
sub __default {
- my ($class, $request) = @_;
+ my ($request) = @_;
- my $recon = LedgerSMB::DBObject::Reconciliation->new($request, copy=>'all');
+ $request->error(Dumper($request));
+
+ my $recon = LedgerSMB::DBObject::Reconciliation->new(base=>$request, copy=>'all');
my $template;
$template = LedgerSMB::Template->new(
user => $user,
- template => 'reconciliation/list.html',
+ template => 'reconciliation/list',
language => $user->{language},
- format=>'html'
+ format=>'HTML',
+ path=>"UI"
);
return $template->render(
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.