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

[..hidden..]

Revision: 5348
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5348&view=rev
Author:   einhverfr
Date:     2012-12-15 04:01:12 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Load errors fixed

Modified Paths:
--------------
    trunk/LedgerSMB/Report/Invoices/Outstanding.pm
    trunk/LedgerSMB/Report/Invoices/Transactions.pm
    trunk/LedgerSMB/Scripts/invoice.pm
    trunk/sql/modules/Report.sql

Modified: trunk/LedgerSMB/Report/Invoices/Outstanding.pm
===================================================================
--- trunk/LedgerSMB/Report/Invoices/Outstanding.pm	2012-12-15 03:12:42 UTC (rev 5347)
+++ trunk/LedgerSMB/Report/Invoices/Outstanding.pm	2012-12-15 04:01:12 UTC (rev 5348)
@@ -50,13 +50,13 @@
 
 has account_id => (is => 'ro', isa => 'Int', required => 0);
 
-=item name
+=item entity_name
 
 Show invoices for customers or vendors with a name like this, full text search
 
 =cut
 
-has name => (is => 'ro', isa => 'Str', required => 0);
+has entity_name => (is => 'ro', isa => 'Str', required => 0);
 
 =item meta_number
 
@@ -203,7 +203,7 @@
         {col_id => 'entity_name',
            name => $entity_label,
            type => 'href', 
-      href_base => 'contact.pl?action=edit&'
+      href_base => 'contact.pl?action=edit&',
          pwidth => 15, },
         {col_id => 'amount',
            name => LedgerSMB::Report::text('Amount'),
@@ -284,7 +284,7 @@
     my $self = shift;
     if ($self->entity_class == 1) {
         return LedgerSMB::Report::text('AP Outstanding');
-    } elsif $self->entity_class == 2) {
+    } elsif ($self->entity_class == 2) {
         return LedgerSMB::Report::text('AR Outstanding');
     }
 }

Modified: trunk/LedgerSMB/Report/Invoices/Transactions.pm
===================================================================
--- trunk/LedgerSMB/Report/Invoices/Transactions.pm	2012-12-15 03:12:42 UTC (rev 5347)
+++ trunk/LedgerSMB/Report/Invoices/Transactions.pm	2012-12-15 04:01:12 UTC (rev 5348)
@@ -40,13 +40,13 @@
 
 has account_id => (is => 'ro', isa => 'Int', required => 0);
 
-=item name text
+=item entity_name text
 
 Full text search of entity name
 
 =cut
 
-has name => (is => 'ro', isa => 'Str', required => 0);
+has entity_name => (is => 'ro', isa => 'Str', required => 0);
 
 =item meta_number
 
@@ -62,7 +62,7 @@
 
 =cut
 
-has employee_id => (is => 'ro', isa => 'Int', requird => 0);
+has employee_id => (is => 'ro', isa => 'Int', required => 0);
 
 =item manager_id
 

Modified: trunk/LedgerSMB/Scripts/invoice.pm
===================================================================
--- trunk/LedgerSMB/Scripts/invoice.pm	2012-12-15 03:12:42 UTC (rev 5347)
+++ trunk/LedgerSMB/Scripts/invoice.pm	2012-12-15 04:01:12 UTC (rev 5348)
@@ -16,7 +16,7 @@
 use LedgerSMB::Template;
 use LedgerSMB::Report::Invoices::Transactions;
 use LedgerSMB::Report::Invoices::Outstanding;
-use LedgerSMB::Scripts::Report;
+use LedgerSMB::Scripts::reports;
 
 =head1 DESCRIPTION
 

Modified: trunk/sql/modules/Report.sql
===================================================================
--- trunk/sql/modules/Report.sql	2012-12-15 03:12:42 UTC (rev 5347)
+++ trunk/sql/modules/Report.sql	2012-12-15 04:01:12 UTC (rev 5348)
@@ -369,7 +369,8 @@
 );
 
 CREATE OR REPLACE FUNCTION report__aa_outstanding_details 
-(in_entity_class int, in_account_id int, in_name text, in_meta_number text,
+(in_entity_class int, in_account_id int, in_entity_name text, 
+ in_meta_number text,
  in_employee_id int, in_business_units int[], in_ship_via text, in_on_hold bool,
  in_date_from date, in_date_to date)
 RETURNS SETOF aa_transactions_line LANGUAGE PLPGSQL AS $$
@@ -406,7 +407,8 @@
  WHERE (in_account_id IS NULL 
           OR EXISTS (select 1 FROM acc_trans 
                       WHERE trans_id = a.id and chart_id = in_account_id))
-       AND (in_name IS NULL OR plainto_tsquery(in_name) @@ eeca.name)
+       AND (in_entity_name IS NULL 
+           OR plainto_tsquery(in_entity_name) @@ eeca.name)
        AND (in_meta_number IS NULL 
           OR eca.meta_number ilike in_meta_number || '%')
        AND (in_employee_id IS NULL OR ee.entity_id = in_employee_id)
@@ -418,7 +420,8 @@
 $$;
 
 CREATE OR REPLACE FUNCTION report__aa_outstanding
-(in_entity_class int, in_account_id int, in_name text, in_meta_number text,
+(in_entity_class int, in_account_id int, in_entity_name text, 
+ in_meta_number text,
  in_employee_id int, in_business_units int[], in_ship_via text, in_on_hold bool)
 RETURNS SETOF aa_transactions_line LANGUAGE SQL AS $$
 
@@ -434,7 +437,8 @@
 $$;
 
 CREATE OR REPLACE FUNCTION report__aa_transactions
-(in_entity_class int, in_account_id int, in_name text, in_meta_number text,
+(in_entity_class int, in_account_id int, in_entity_name text, 
+ in_meta_number text,
  in_employee_id int, in_manager_id int, in_invnumber text, in_ordnumber text,
  in_ponumber text, in_source text, in_description text, in_notes text, 
  in_shipvia text, in_date_from text, in_date_to text, in_on_hold bool,
@@ -479,7 +483,8 @@
  WHERE (in_account_id IS NULL OR 
        EXISTS (select * from acc_trans 
                 where trans_id = a.id AND chart_id = in_account_id))
-       AND (in_name IS NULL OR eeca.name ilike in_name || '%')
+       AND (in_entity_name IS NULL 
+           OR eeca.name ilike in_entity_name || '%')
        AND (in_meta_number IS NULL OR eca.meta_number ilike in_meta_number)
        AND (in_employee_id = ee.id OR in_employee_id IS NULL)
        AND (in_manager_id = mee.id OR in_manager_id IS NULL)

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