summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LedgerSMB/Location.pm6
-rw-r--r--sql/upgrade/1.2-1.3.sql2
2 files changed, 5 insertions, 3 deletions
diff --git a/LedgerSMB/Location.pm b/LedgerSMB/Location.pm
index 95128e51..69403a7b 100644
--- a/LedgerSMB/Location.pm
+++ b/LedgerSMB/Location.pm
@@ -37,8 +37,10 @@ our $VERSION = '1.0.0';
our @ISA = qw(LedgerSMB::DBObject);
sub AUTOLOAD {
- my $procname = "location_$LedgerSMB::Location::Autoload";
- $self->exec_method($procname);
+ my $self = shift;
+ $AUTOLOAD =~ s/^.*:://;
+ my $procname = "location_$AUTOLOAD";
+ $self->exec_method($procname, @_);
}
sub save {
diff --git a/sql/upgrade/1.2-1.3.sql b/sql/upgrade/1.2-1.3.sql
index 73182815..97cef533 100644
--- a/sql/upgrade/1.2-1.3.sql
+++ b/sql/upgrade/1.2-1.3.sql
@@ -155,7 +155,7 @@ FROM employees e LEFT JOIN employees m ON (e.managerid = m.id);
CREATE OR REPLACE FUNCTION employee_search
(in_startdatefrom date, in_startdateto date, in_name varchar, in_notes text,
- in_enddateto date, in_enddatefrom date)
+ in_enddateto date, in_enddatefrom date, in_sales boolean)
RETURNS SETOF employee_search AS
$$
DECLARE