SF.net SVN: ledger-smb: [2042] trunk/bin

[..hidden..]

Revision: 2042
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2042&view=rev
Author:   einhverfr
Date:     2008-01-11 22:24:57 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
Merging invoice fixes from branches 1.2

Modified Paths:
--------------
    trunk/bin/ir.pl
    trunk/bin/is.pl
    trunk/bin/oe.pl

Modified: trunk/bin/ir.pl
===================================================================
--- trunk/bin/ir.pl	2008-01-12 06:23:30 UTC (rev 2041)
+++ trunk/bin/ir.pl	2008-01-12 06:24:57 UTC (rev 2042)
@@ -819,7 +819,6 @@
     if ( $form->{import_text} ) {
         &import_text;
     }
-
     $form->{exchangerate} =
       $form->parse_amount( \%myconfig, $form->{exchangerate} );
 
@@ -953,9 +952,9 @@
                 for ( keys %{ $form->{item_list}[0] } ) {
                     $form->{"${_}_$i"} = $form->{item_list}[0]{$_};
                 }
-
-                $form->{"discount_$i"} = $form->{discount} * 100;
-
+                if (! defined $form->{"discount_$i"}){
+                    $form->{"discount_$i"} = $form->{discount} * 100;
+                }
                 if ($sellprice) {
                     $form->{"sellprice_$i"} = $sellprice;
 

Modified: trunk/bin/is.pl
===================================================================
--- trunk/bin/is.pl	2008-01-12 06:23:30 UTC (rev 2041)
+++ trunk/bin/is.pl	2008-01-12 06:24:57 UTC (rev 2042)
@@ -974,9 +974,9 @@
                 for ( keys %{ $form->{item_list}[0] } ) {
                     $form->{"${_}_$i"} = $form->{item_list}[0]{$_};
                 }
-
-                $form->{"discount_$i"} = $form->{discount} * 100;
-
+                if (! defined $form->{"discount_$i"}){
+                    $form->{"discount_$i"} = $form->{discount} * 100;
+                }
                 if ($sellprice) {
                     $form->{"sellprice_$i"} = $sellprice;
 

Modified: trunk/bin/oe.pl
===================================================================
--- trunk/bin/oe.pl	2008-01-12 06:23:30 UTC (rev 2041)
+++ trunk/bin/oe.pl	2008-01-12 06:24:57 UTC (rev 2042)
@@ -1048,9 +1048,9 @@
                 for ( keys %{ $form->{item_list}[0] } ) {
                     $form->{"${_}_$i"} = $form->{item_list}[0]{$_};
                 }
-
-                $form->{"discount_$i"} = $form->{discount} * 100;
-
+                if (! defined $form->{"discount_$i"}){
+                    $form->{"discount_$i"} = $form->{discount} * 100;
+                }
                 if ($sellprice) {
                     $form->{"sellprice_$i"} = $sellprice;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.