summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-06-25 18:19:28 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-06-25 18:19:28 +0000
commit415b287555b84bee01d2acbf4e7c6434e1cdba7f (patch)
treed28c32a07a649f2c9916944e323659fb2099a020
parent303dce5e2a316ee128a3ab7935bc47533246b5b1 (diff)
Correcting issue on Vendor screen. Displaying wrong account info when selecting entity from vendor report.
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2172 4979c152-3d1c-0410-bac9-87ea11338e46
-rw-r--r--LedgerSMB/DBObject/Company.pm2
-rw-r--r--scripts/vendor.pl3
-rw-r--r--sql/modules/Company.sql4
3 files changed, 5 insertions, 4 deletions
diff --git a/LedgerSMB/DBObject/Company.pm b/LedgerSMB/DBObject/Company.pm
index 2d538582..c2676de2 100644
--- a/LedgerSMB/DBObject/Company.pm
+++ b/LedgerSMB/DBObject/Company.pm
@@ -185,7 +185,7 @@ sub get {
my $self = shift @_;
$self->set_entity_class();
- my ($ref) = $self->exec_method(funcname => 'entity__retrieve_credit');
+ my ($ref) = $self->exec_method(funcname => 'company_retrieve');
$self->merge($ref);
$self->{threshold} = $self->format_amount(amount => $self->{threshold});
diff --git a/scripts/vendor.pl b/scripts/vendor.pl
index 321f76d4..2119d46c 100644
--- a/scripts/vendor.pl
+++ b/scripts/vendor.pl
@@ -149,7 +149,8 @@ sub get_results {
push @rows,
{legal_name => $ref->{legal_name},
meta_number => {text => $ref->{meta_number},
- href => "$get_url&entity_id=$ref->{entity_id}"},
+ href => "$get_url&entity_id=$ref->{entity_id}" . "&meta_number=$ref->{meta_number}"
+ },
business_type => $ref->{business_type},
curr => $ref->{curr},
};
diff --git a/sql/modules/Company.sql b/sql/modules/Company.sql
index b7f5e640..b5dd76cc 100644
--- a/sql/modules/Company.sql
+++ b/sql/modules/Company.sql
@@ -220,11 +220,11 @@ BEGIN
END;
$$ LANGUAGE PLPGSQL;
-CREATE OR REPLACE FUNCTION company_retrieve (in_id int) RETURNS company AS
+CREATE OR REPLACE FUNCTION company_retrieve (in_entity_id int) RETURNS company AS
$$
DECLARE t_company company;
BEGIN
- SELECT * INTO t_company FROM company WHERE id = in_id;
+ SELECT * INTO t_company FROM company WHERE entity_id = in_entity_id;
RETURN t_company;
END;
$$ language plpgsql;