Correcting the last errors for the draft approval on secondary test instance

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2203 4979c152-3d1c-0410-bac9-87ea11338e46

3 files changed, 14 insertions, 6 deletions

diff --git a/LedgerSMB/DBObject/Draft.pm b/LedgerSMB/DBObject/Draft.pm
index 2aec59a9..b57bd238 100644
--- a/LedgerSMB/DBObject/Draft.pm
+++ b/LedgerSMB/DBObject/Draft.pm
@@ -4,24 +4,27 @@ use base qw/LedgerSMB::DBObject/;
 
 sub search {
     my ($self) = @_;
-    @{$self->{draft_results} = $self->exec_method(funcname => 'draft__search');
-    return @{$self->{draft_results};
+    @{$self->{draft_results}} = $self->exec_method(funcname => 'draft__search');
+    return @{$self->{draft_results}};
 }
 
 sub approve {
    my ($self) = @_;
    if (!$self->{id}){
-       $self->error($self->{_locale}->text('No ID Set');
+       $self->error($self->{_locale}->text('No ID Set'));
    }
    ($self->{approved}) = $self->exec_method(funcname => 'draft_approve');
+   $self->{dbh}->commit;
    return $self->{approved};
 }
 
 sub delete {
    my ($self) = @_;
    if (!$self->{id}){
-       $self->error($self->{_locale}->text('No ID Set');
+       $self->error($self->{_locale}->text('No ID Set'));
    }
    ($self->{deleted}) = $self->exec_method(funcname => 'draft_delete');
    return $self->{deleted};
 }
+
+1;
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 1d61ac09..ab85c326 100644
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -2241,7 +2241,8 @@ sub create_links {
 				d.description AS department,
 				a.amount AS oldinvtotal, a.paid AS oldtotalpaid,
 				a.person_id, e.name AS employee, 
-				c.language_code, a.ponumber, a.reverse
+				c.language_code, a.ponumber, a.reverse,
+                                a.approved
 			FROM $arap a
 			JOIN entity_credit_account c USING (entity_id)
 			JOIN entity ce ON (ce.id = c.entity_id)
@@ -2258,6 +2259,10 @@ sub create_links {
         $ref = $sth->fetchrow_hashref('NAME_lc');
         $self->db_parse_numeric(sth=>$sth, hashref=>$ref);
 
+        if (!defined $ref->{approved}){
+           $ref->{approved} = 0;
+        }
+
         foreach $key ( keys %$ref ) {
             $self->{$key} = $ref->{$key};
         }
diff --git a/LedgerSMB/Sysconfig.pm b/LedgerSMB/Sysconfig.pm
index 1d93ce8f..4b50ab75 100644
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -83,7 +83,7 @@ read_config( 'ledgersmb.conf' => %config ) or die;
 # Root variables
 for $var (
     qw(pathsep logging check_max_invoices language auth latex
-    db_autoupdate force_username_case)
+    db_autoupdate force_username_case max_post_size)
   )
 {
     ${$var} = $config{''}{$var} if $config{''}{$var};