Fix for bug 1258, manual tax on invoice screen did not respect number…

… formats
pongraczi · Oct 17, 2014 · 1134fe8 · 1134fe8
1 parent 55a3d3e
commit 1134fe8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Changelog b/Changelog
@@ -15,6 +15,7 @@ Changelog for 1.3.45
 * Fixed internal server error on single payment interface (Chris T)
 * Fixed bug 1240, false alarms of customer credit usage exceeded (Chris T)
 * Adding tax_id hidden field to order and offer forms to be able to include it on tex templates (Pongracz I)
+* Fixed bug 1258, manual tax number entries do not respect number formats (Pongracz I)
 
 Chris T is Chris Travers
 Pongracz I is Pongracz Istvan

diff --git a/bin/is.pl b/bin/is.pl
@@ -735,7 +735,7 @@ sub form_footer {
                            * $form->{"mt_basis_$item"};
                }
                $form->{invtotal} += $form->round_amount(
-                                         $form->{"mt_amount_$item"}, 2);
+                                         $form->parse_amount( \%myconfig,  $form->{"mt_amount_$item"}), 2);
                # Setting this up as a table
                # Note that the screens may be not wide enough to display
                # this in the normal way so we have to change the layout of the
@@ -744,15 +744,15 @@ sub form_footer {
                 <th align=right>$form->{"${taccno}_description"}</th>
                 <td><input type="text" name="mt_amount_$item"
                         id="mt-amount-$item" value="|
-                        .$form->format_amount(\%myconfig, $form->{"mt_amount_$item"}) 
+                        .$form->format_amount(\%myconfig, $form->{"mt_amount_$item"}, 2) 
                         .qq|" size="10"/></td>
                 <td><input type="text" name="mt_rate_$item"
                          id="mt-rate-$item" value="|
                         .$form->format_amount(\%myconfig, $form->{"mt_rate_$item"}) 
                         .qq|" size="4"/></td>
                 <td><input type="text" name="mt_basis_$item"
                          id="mt-basis-$item" value="|
-                        .$form->format_amount(\%myconfig, $form->{"mt_basis_$item"}) 
+                        .$form->format_amount(\%myconfig, $form->{"mt_basis_$item"}, 2) 
                         .qq|" size="10"/></td>
                 <td><input type="text" name="mt_ref_$item"
                          id="mt-ref-$item" value="|