summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-11-10 18:58:42 +0000
committereinhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>2008-11-10 18:58:42 +0000
commitb373465898535055867ce8acdea26a6518a99ebd (patch)
tree10d5ab4bb32164103ddc031e6e178de26db9a484
parentbe2b4fb16b843cf52e14b5b3e3a36b3faf4df970 (diff)
Unapplying for now the drafts fix
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2384 4979c152-3d1c-0410-bac9-87ea11338e46
-rw-r--r--LedgerSMB/DBObject.pm4
-rw-r--r--LedgerSMB/GL.pm1
-rw-r--r--scripts/drafts.pl2
-rw-r--r--scripts/vendor.pl2
4 files changed, 4 insertions, 5 deletions
diff --git a/LedgerSMB/DBObject.pm b/LedgerSMB/DBObject.pm
index dade3ab8..57f5ac6f 100644
--- a/LedgerSMB/DBObject.pm
+++ b/LedgerSMB/DBObject.pm
@@ -121,7 +121,7 @@ sub exec_method {
$ref = $sth->fetchrow_hashref('NAME_lc');
- my $pargs = $ref->{proargnames};
+ my $args = $ref->{proargnames};
my @proc_args;
if ( !$ref->{proname} ) { # no such function
@@ -132,7 +132,7 @@ sub exec_method {
$ref->{pronargs} = 0 unless defined $ref->{pronargs};
# If the user provided args..
if (!defined $args{args}) {
- @proc_args = $self->_parse_array($pargs);
+ @proc_args = $self->_parse_array($args);
if (@proc_args) {
for my $arg (@proc_args) {
if ( $arg =~ s/^in_// ) {
diff --git a/LedgerSMB/GL.pm b/LedgerSMB/GL.pm
index c399b1cf..22976c2d 100644
--- a/LedgerSMB/GL.pm
+++ b/LedgerSMB/GL.pm
@@ -564,7 +564,6 @@ sub transaction {
my $results = $sth->fetchall_hashref('setting_key');
$form->{closedto} = $results->{'closedto'}->{'value'};
$form->{revtrans} = $results->{'revtrans'}->{'value'};
- #$form->{separate_duties} = $results->{'separate_duties'}->{'value'};
$sth->finish;
$query = qq|SELECT g.*, d.description AS department
diff --git a/scripts/drafts.pl b/scripts/drafts.pl
index 7d6008ec..f7771f30 100644
--- a/scripts/drafts.pl
+++ b/scripts/drafts.pl
@@ -11,7 +11,7 @@ sub search {
$request->{class_types} = [
{text => $request->{_locale}->text('AR'), value => 'ar'},
{text => $request->{_locale}->text('AP'), value => 'ap'},
- {text => $request->{_locale}->text('GL'), value => 'gl'},
+ {text => $request->{_locale}->text('GL'), value => 'GL'},
];
my $template = LedgerSMB::Template->new(
user =>$request->{_user},
diff --git a/scripts/vendor.pl b/scripts/vendor.pl
index 45a46cb6..0f86c553 100644
--- a/scripts/vendor.pl
+++ b/scripts/vendor.pl
@@ -23,7 +23,7 @@ package LedgerSMB::Scripts::vendor;
use LedgerSMB::DBObject::Vendor;
use base qw(LedgerSMB::ScriptLib::Company);
-# require 'lsmb-request.pl';
+require 'lsmb-request.pl';
sub set_entity_class {
my ($null, $request) = @_;