SF.net SVN: ledger-smb: [2056] branches/1.2

[..hidden..]

Revision: 2056
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2056&view=rev
Author:   einhverfr
Date:     2008-01-19 20:08:23 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------

Fixing bug 1844159:  Vendor Info Incorrectly Escaped in Check Printing Module
Fixing bug 1849585:  Serial numbers not preserved on order consolidation

Modified Paths:
--------------
    branches/1.2/LedgerSMB/OE.pm
    branches/1.2/bin/cp.pl

Modified: branches/1.2/LedgerSMB/OE.pm
===================================================================
--- branches/1.2/LedgerSMB/OE.pm	2008-01-18 21:45:34 UTC (rev 2055)
+++ branches/1.2/LedgerSMB/OE.pm	2008-01-20 04:08:23 UTC (rev 2056)
@@ -2610,7 +2610,7 @@
 					project_id, ship, serialnumber, notes)
 				SELECT ?, parts_id, description, qty, 
 				       sellprice, discount, unit, reqdate, 
-				       project_id, 0, description, qty
+				       project_id, 0, serialnumber, qty
                                   FROM orderitems 
 				 WHERE trans_id IN ($orderid_str)|;
 

Modified: branches/1.2/bin/cp.pl
===================================================================
--- branches/1.2/bin/cp.pl	2008-01-18 21:45:34 UTC (rev 2055)
+++ branches/1.2/bin/cp.pl	2008-01-20 04:08:23 UTC (rev 2056)
@@ -1392,12 +1392,7 @@
     %oldform = ();
     for ( keys %$form ) { $oldform{$_} = $form->{$_} }
 
-    @a =
-      qw(name company address text_amount text_decimal address1 address2 city state zipcode country memo);
-    for (@a) { $temp{$_} = $form->{$_} }
 
-    $form->format_string(@a);
-
     $ok             = 0;
     $j              = 0;
     $temp{rowcount} = $form->{rowcount};
@@ -1464,7 +1459,12 @@
     ( $form->{yyyy}, $form->{mm}, $form->{dd} ) = $datepaid =~ /(....)(..)(..)/;
 
     &{"$form->{vc}_details"};
+    @a =
+      qw(name company address text_amount text_decimal address1 address2 city state zipcode country memo);
+    for (@a) { $temp{$_} = $form->{$_} }
 
+    $form->format_string(@a);
+
     $form->{templates} = "$myconfig{templates}";
     $form->{IN}        = "$form->{formname}.tex";
 


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