SF.net SVN: ledger-smb:[4739] trunk

[..hidden..]

Revision: 4739
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4739&view=rev
Author:   einhverfr
Date:     2012-05-21 01:04:48 +0000 (Mon, 21 May 2012)
Log Message:
-----------
Correcting csv infinite loop on bad formatting

Modified Paths:
--------------
    trunk/LedgerSMB/DBObject/Report.pm
    trunk/LedgerSMB/Scripts/import_csv.pm

Added Paths:
-----------
    trunk/LedgerSMB/DBObject/Report/Aging.pm
    trunk/UI/Reports/filters/

Added: trunk/LedgerSMB/DBObject/Report/Aging.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Report/Aging.pm	                        (rev 0)
+++ trunk/LedgerSMB/DBObject/Report/Aging.pm	2012-05-21 01:04:48 UTC (rev 4739)
@@ -0,0 +1,274 @@
+=head1 NAME
+
+LedgerSMB::DBObject::Report::Aging - AR/AP Aging reports for LedgerSMB
+
+=head1 SYNPOSIS
+
+  my $agereport = LedgerSMB::DBObject::Report::Aging->new(%$request);
+  $agereport->run;
+  $agereport->render($request, $format);
+
+=head1 DESCRIPTION
+
+This module provides reports that show how far overdue payments for invoices
+are.  This can be useful to help better manage collection of moneys owed, etc.
+
+This module is also capable of printing statements, which are basically aging
+reportins aimed at the customer in question.
+
+=head1 INHERITS
+
+=over
+
+=item LedgerSMB::DBObject::Report;
+
+=back
+
+=cut
+
+package LedgerSMB::DBObject::Report::GL;
+use Moose;
+extends 'LedgerSMB::DBObject::Report';
+
+use LedgerSMB::DBObject::Business_Unit_Class;
+use LedgerSMB::DBObject::Business_Unit;
+use LedgerSMB::App_State;
+
+my $locale = $LedgerSMB::App_State::Locale;
+
+=head1 PROPERTIES
+
+=over
+
+=item columns
+
+Read-only accessor, returns a list of columns.
+
+=over
+
+=item select
+
+=item credit_account
+
+=item language
+
+=item invnumber
+
+=item order
+
+=item transdate
+
+=item duedate
+
+=item c0
+
+=item c30
+
+=item c60
+
+=item c90
+
+=item total
+
+=item one for each business unit class returned
+
+=back
+
+=cut
+
+
+
+
+sub columns {
+    my ($self) = @_;
+    our @COLUMNS = ();
+    my $credit_label;
+    if ($self->entity_class == 1) {
+        $credit_label = $LedgerSMB::App_State::Locale->text('Vendor');
+    } elsif $self->entity_class == 2){
+        $credit_label = $LedgerSMB::App_State::Locale->text('Customer');
+    }
+    push @COLUMNS,
+      {col_id => 'select'
+         type => 'checkbox'},
+ 
+      {col_id => 'credit_acct',
+         name => $credit_label,
+         type => 'text',
+       pwidth => 1, },
+
+      {col_id => 'language',
+         name => $locale->text('Language'),
+         type => 'select',
+       pwidth => '0', };
+
+   if ($self->report_type eq 'detail'){
+     push @columns,
+          {col_id => 'invnumber',
+             name => $locale->text('Invoice'),
+             type => 'href',
+        href_base => '',
+           pwidth => '3', },
+
+          {col_id => 'ordnumber',
+             name => $locale->text('Description'),
+             type => 'text',
+           pwidth => '6', },
+
+          {col_id => 'transdate',
+             name => $locale->text('Date'),
+             type => 'text',
+           pwidth => '1', },
+
+          {col_id => 'duedate',
+             name => $locale->text('Due Date'),
+             type => 'text',
+           pwidth => '2', };
+
+    push @COLUMNS,
+    {col_id => 'c0',
+       name => $locale->text('Current'),
+       type => 'text',
+     pwidth => '2', },
+
+    {col_id => 'c30',
+       name => $locale->text('30'),
+       type => 'text',
+     pwidth => '3', },
+
+    {col_id => 'c60',
+       name => $locale->text('60'),
+       type => 'text',
+     pwidth => '3', },
+
+    {col_id => 'c90',
+       name => $locale->text('90'),
+       type => 'text',
+     pwidth => '3', },
+
+    {col_id => 'total',
+       name => $locale->text('Total'),
+       type => 'text',
+     pwidth => '1', },
+    return ..hidden..;
+}
+
+    # TODO:  business_units int[]
+
+=item filter_template
+
+Returns the template name for the filter.
+
+=cut
+
+sub filter_template {
+    return 'journal/search';
+}
+
+=item name
+
+Returns the localized template name
+
+=cut
+
+sub name {
+    return $locale->text('Aging Report');
+}
+
+=item template
+
+Returns the name of the template to use
+
+=cut
+
+sub template {
+    my ($self) = @_;
+    if (!$self->format or (uc($self->format) eq 'HTML') 
+           or (uc($self->format) eq 'PDF'))
+    {
+           return 'aging_report';
+    }
+    else {
+       return undef;
+    }
+}
+
+=item header_lines
+
+Returns the inputs to display on header.
+
+=cut
+
+sub header_lines {
+    return [];
+}
+
+=head2 Criteria Properties
+
+Note that in all cases, undef matches everything.
+
+=item report_type
+
+Is 'summary' or 'detail'
+
+=cut
+
+has 'report_type' => (is => 'rw', isa => 'Str');
+
+=item accno
+
+Exact match for the account number for the AR/AP account
+
+=cut
+
+has 'accno'  => (is => 'rw', isa => 'Maybe[Str]');
+
+
+=item to_date
+
+Calculate report as on a specific date
+
+=cut
+
+has 'date_ref' => (is => 'rw', isa => 'Maybe[LedgerSMB::PGDate]');
+
+=head1 METHODS
+
+=over
+
+=item prepare_criteria($request)
+
+Instantiates the PGDate and PGNumber inputs.
+
+=cut
+
+sub prepare_criteria{
+    my ($self, $request) = @_;
+    $request->{to_date} = LedgerSMB::PGDate->from_input($request->{to_date});
+    $request->{accno} =~ s/--.*$//;
+}
+
+=item run_report()
+
+Runs the report, and assigns rows to $self->rows.
+
+=cut
+
+sub run_report{
+    my ($self) = @_;
+    my @rows = $self->exec_method({funcname => 'report__invoice_aging_' .
+                                                $self->report_type});
+    $self->rows(..hidden..);
+}
+
+
+=head1 COPYRIGHT
+
+COPYRIGHT (C) 2012 The LedgerSMB Core Team.  This file may be re-used following
+the terms of the GNU General Public License version 2 or at your option any
+later version.  Please see included LICENSE.TXT for details.
+
+=cut
+
+__PACKAGE__->meta->make_immutable;
+return 1;

Modified: trunk/LedgerSMB/DBObject/Report.pm
===================================================================
--- trunk/LedgerSMB/DBObject/Report.pm	2012-05-20 14:07:20 UTC (rev 4738)
+++ trunk/LedgerSMB/DBObject/Report.pm	2012-05-21 01:04:48 UTC (rev 4739)
@@ -123,11 +123,11 @@
 sub render {
     my ($self, $request) = @_;
     my $template;
-    if ($template = eval {$self->{template}}){
-       # what needs to be done here?  Maybe log it? 
-    } else {
-        $template = 'Reports/display_report';
-    }
+
+    # This is a hook for other modules to use to override the default
+    # template --CT
+    eval {$template = $self->template} || $template = 'Reports/display_report';
+
     if (!defined $self->format){
         $self->format('html');
     }

Modified: trunk/LedgerSMB/Scripts/import_csv.pm
===================================================================
--- trunk/LedgerSMB/Scripts/import_csv.pm	2012-05-20 14:07:20 UTC (rev 4738)
+++ trunk/LedgerSMB/Scripts/import_csv.pm	2012-05-21 01:04:48 UTC (rev 4739)
@@ -208,7 +208,8 @@
         $line =~ s/[^"]"",/"/g;
         while ($line ne '') {
             if ($line =~ /^"/){
-                $line =~ s/"(.*?)"(,|$)//;
+                $line =~ s/"(.*?)"(,|$)// 
+                    || $self->error($self->{_locale}->text('Invalid file'));
                 my $field = $1;
                 $field =~ s/\s*$//;
                 push @fields, $field;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.