diff options
| -rwxr-xr-x | bin/io.pl | 34 | ||||
| -rwxr-xr-x | bin/ir.pl | 23 | ||||
| -rwxr-xr-x | bin/is.pl | 28 | ||||
| -rwxr-xr-x | bin/pos.pl | 22 |
4 files changed, 58 insertions, 49 deletions
@@ -81,6 +81,40 @@ if ( -f "bin/custom/$form->{login}_io.pl" ) { # $locale->text('Nov') # $locale->text('Dec') +sub _calc_taxes { + for $i (1 .. $form->{rowcount}){ + my $linetotal = + $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}) + * $form->parse_amount(\%myconfig, $form->{"qty_$i"}) + * (1 - $form->parse_amount(\%myconfig, $form->{"discount_$i"}) + / 100); + @taxaccounts = Tax::init_taxes( + $form, $form->{"taxaccounts_$i"}, + $form->{'taxaccounts'} + ); + my $tax; + my $fxtax; + my $amount; + if ( $form->{taxincluded} ) { + $tax += $amount = + Tax::calculate_taxes( \@taxaccounts, $form, $linetotal, 1 ); + + $form->{"sellprice_$i"} -= $amount / $form->{"qty_$i"}; + } + else { + $tax += $amount = + Tax::calculate_taxes( \@taxaccounts, $form, $linetotal, 0 ); + $fxtax += + Tax::calculate_taxes( \@taxaccounts, $form, $fxlinetotal, 0 ) + if $fxlinetotal; + } + for (@taxaccounts) { + $form->{taxes}{$_->account} = 0 if ! $form->{taxes}{$_->account}; + $form->{taxes}{$_->account} += $_->value; + } + } +} + sub display_row { my $numrows = shift; @@ -457,7 +457,7 @@ sub form_header { } sub form_footer { - + _calc_taxes(); $form->{invtotal} = $form->{invsubtotal}; if ( ( $rows = $form->numtextrows( $form->{notes}, 35, 8 ) ) < 2 ) { @@ -471,7 +471,7 @@ sub form_footer { qq|<textarea name=notes rows=$rows cols=35 wrap=soft>$form->{notes}</textarea>|; $intnotes = qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</textarea>|; - + $tax = ""; $form->{taxincluded} = ( $form->{taxincluded} ) ? "checked" : ""; $taxincluded = ""; @@ -483,26 +483,17 @@ qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</texta } if ( !$form->{taxincluded} ) { - my @taxset = Tax::init_taxes( $form, $form->{taxaccounts} ); - foreach $taxobj (@taxset) { - $item = $taxobj->account; - $form->{invtotal} += $form->round_amount( - $form->{"${item}_rate"} * $form->{"${item}_base"}, 2); - $form->{"${item}_total"} = - $form->format_amount( \%myconfig, - $form->{"${item}_rate"} * $form->{"${item}_base"}, 2 ); - if ( $form->{"${item}_base"} ) { - $form->{"${item}_total"} = - $form->format_amount( \%myconfig, - $form->round_amount( $taxobj->value, 2 ), 2 ); - + foreach $item (keys %{$form->{taxes}}) { + my $taccno = $item; + $form->{invtotal} += $form->round_amount($form->{taxes}{$item}, 2); + $form->{"${taccno}_total"} = + $form->round_amount($form->{taxes}{$item}, 2); $tax .= qq| <tr> <th align=right>$form->{"${item}_description"}</th> <td align=right>$form->{"${item}_total"}</td> </tr> |; - } } $form->{invsubtotal} = @@ -507,7 +507,7 @@ sub form_header { } sub form_footer { - + _calc_taxes(); $form->{invtotal} = $form->{invsubtotal}; if ( ( $rows = $form->numtextrows( $form->{notes}, 35, 8 ) ) < 2 ) { @@ -538,20 +538,17 @@ qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</texta } if ( !$form->{taxincluded} ) { - my @taxes = Tax::init_taxes( $form, $form->{taxaccounts} ); - foreach $item (@taxes) { - my $taccno = $item->account; - $form->{invtotal} += $form->round_amount( - $form->{"${taccno}_rate"} * $form->{"${taccno}_base"}, 2); + foreach $item (keys %{$form->{taxes}}) { + my $taccno = $item; + $form->{invtotal} += $form->round_amount($form->{taxes}{$item}, 2); $form->{"${taccno}_total"} = - $form->format_amount( \%myconfig, - $form->{"${taccno}_rate"} * $form->{"${taccno}_base"}, 2 ); + $form->format_amount( \%myconfig, + $form->round_amount( $form->{taxes}{$item}, 2 ), 2 ); $tax .= qq| <tr> <th align=right>$form->{"${taccno}_description"}</th> <td align=right>$form->{"${taccno}_total"}</td> - </tr> - | if $form->{"${taccno}_base"}; + </tr>|; } $form->{invsubtotal} = @@ -811,7 +808,7 @@ qq|<td align=center><input name="memo_$i" size=11 value="$form->{"memo_$i"}"></t } sub update { - + $form->{taxes} = {}; $form->{exchangerate} = $form->parse_amount( \%myconfig, $form->{exchangerate} ); @@ -988,13 +985,8 @@ sub update { for ( split / /, $form->{"taxaccounts_$i"} ) { $form->{"${_}_base"} += $amount; } - if ( !$form->{taxincluded} ) { - my @taxes = - Tax::init_taxes( $form, $form->{"taxaccounts_$i"}, - $form->{taxaccounts} ); - $amount += - Tax::calculate_taxes( \@taxes, $form, $amount, 0 ); - } + + $form->{creditremaining} -= $amount; @@ -396,7 +396,7 @@ sub form_header { } sub form_footer { - + _calc_taxes(); $form->{invtotal} = $form->{invsubtotal}; $form->{taxincluded} = ( $form->{taxincluded} ) ? "checked" : ""; @@ -415,25 +415,17 @@ sub form_footer { if ( !$form->{taxincluded} ) { - my @taxset = Tax::init_taxes( $form, $form->{taxaccounts} ); - foreach $taxobj (@taxset) { - $item = $taxobj->account; - $form->{invtotal} += $form->round_amount( - $form->{"${item}_rate"} * $form->{"${item}_base"}, 2); - $form->{"${item}_total"} = - $form->format_amount( \%myconfig, - $form->{"${item}_rate"} * $form->{"${item}_base"}, 2 ); - if ( $form->{"${item}_base"} ) { - $form->{"${item}_total"} = + foreach $item (keys %{$form->{taxes}}) { + my $taccno = $item; + $form->{invtotal} += $form->round_amount($form->{taxes}{$item}, 2); + $form->{"${taccno}_total"} = $form->format_amount( \%myconfig, - $form->round_amount( $taxobj->value, 2 ), 2 ); + $form->round_amount( $form->{taxes}{$item}, 2 ), 2 ); $tax .= qq| <tr> <th align=right>$form->{"${item}_description"}</th> <td align=right>$form->{"${item}_total"}</td> - </tr> -|; - } + </tr>|; } $form->{invsubtotal} = |