diff --git a/old/bin/aa.pl b/old/bin/aa.pl index 317935be4c0..fdcc320faac 100644 --- a/old/bin/aa.pl +++ b/old/bin/aa.pl @@ -184,7 +184,7 @@ sub reverse { } } - &display_form; + &display_form( readonly => 1 ); } sub post_reversing { @@ -233,6 +233,7 @@ sub post_reversing { } sub display_form { + my %args = @_; my $invnumber = "sinumber"; if ( $form->{vc} eq 'vendor' ) { $invnumber = "vinumber"; @@ -244,8 +245,8 @@ sub display_form { $form->generate_selects(\%myconfig); $form->open_form; AA->get_files($form, $locale); - &form_header; - &form_footer; + &form_header( readonly => $args{readonly} ); + &form_footer( readonly => $args{readonly} ); } @@ -435,7 +436,9 @@ sub create_links { } sub form_header { - my $min_lines = $form->get_setting('min_empty') // 0; + my %args = @_; + my $min_lines = $form->get_setting('min_empty') // 0; + my $readonly = $args{readonly} ? 'readonly' : ''; $form->generate_selects(\%myconfig) unless $form->{"select$form->{ARAP}"}; $title = $form->{title}; @@ -501,14 +504,14 @@ sub form_header { $exchangerate = qq||; $exchangerate .= qq| - | + | if $form->{defaultcurrency}; if ( $form->{defaultcurrency} && $form->{currency} ne $form->{defaultcurrency} ) { $exchangerate .= qq| - + |; } else { @@ -531,7 +534,7 @@ sub form_header { $department = qq| | . $locale->text('Department') . qq| - + @@ -543,8 +546,8 @@ sub form_header { $name = ( $form->{"select$form->{vc}"} ) - ? qq|| - : qq| + ? qq|| + : qq| [| . $locale->text('New') . qq|]|; @@ -562,7 +565,7 @@ sub form_header { $employee = qq| - + @@ -717,7 +720,7 @@ sub form_header { - + @@ -733,7 +736,7 @@ sub form_header { - + @@ -774,7 +777,7 @@ sub form_header { $form->format_amount( \%myconfig,$form->{"amount_$i"}, LedgerSMB::Setting->new(%$form)->get('decimal_places') ); $project = qq| - + | if $form->{selectprojectnumber}; $project //= ''; @@ -783,36 +786,36 @@ sub form_header { 1 ) { $description = -qq||; +qq||; } else { $description = -qq||; +qq||; } $taxchecked=""; if($form->{"taxformcheck_$i"} or ($form->{default_reportable} and ($i == $form->{rowcount}))) { $taxchecked=qq|CHECKED="CHECKED"|; - + $taxchecked.=q| disabled="disabled"| if $readonly; } $taxformcheck=qq||; print qq| - + | . (($form->{currency} ne $form->{defaultcurrency}) ? $form->format_amount(\%myconfig, $form->parse_amount( \%myconfig, $form->{"amount_$i"} ) * $form->{exchangerate}, LedgerSMB::Setting->new(%$form)->get('decimal_places')) : '') . qq| - + $description $taxformcheck $project|; for my $cls (@{$form->{bu_class}}){ if (scalar @{$form->{b_units}->{"$cls->{id}"}}){ - print qq| |; for my $bu (@{$form->{b_units}->{"$cls->{id}"}}){ my $selected = ''; @@ -844,7 +847,7 @@ sub form_header { print qq| {"tax_$item"} /> + size=10 value=$form->{"tax_$item"} $readonly /> {"calctax_$item"} @@ -879,7 +882,7 @@ sub form_header { \%myconfig, $form->{invtotal} * $form->{exchangerate}, LedgerSMB::Setting->new(%$form)->get('decimal_places')) : '') . qq| - $selectARAP diff --git a/sql/changes/1.10/reversed-transactions.sql b/sql/changes/1.11/reversed-transactions.sql similarity index 100% rename from sql/changes/1.10/reversed-transactions.sql rename to sql/changes/1.11/reversed-transactions.sql diff --git a/sql/changes/LOADORDER b/sql/changes/LOADORDER index e6153e775e9..ae0c9c5d515 100644 --- a/sql/changes/LOADORDER +++ b/sql/changes/LOADORDER @@ -168,4 +168,5 @@ mc/delete-migration-validation-data.sql 1.10/unique-transaction-reconciliation.sql 1.10/missing-fkeys.sql 1.10/file-tranaction-cascade-delete.sql -1.10/reversed-transactions.sql +# 1.11 changes +1.11/reversed-transactions.sql