Fixing bug 1844159: Vendor Info Incorrectly Escaped in Check Printing Module

Fixing bug 1849585:  Serial numbers not preserved on order consolidation

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@2056 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 6 insertions, 6 deletions

diff --git a/LedgerSMB/OE.pm b/LedgerSMB/OE.pm
index 5383d808..856968d0 100755
--- a/LedgerSMB/OE.pm
+++ b/LedgerSMB/OE.pm
@@ -2610,7 +2610,7 @@ sub consolidate_orders {
 					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)|;
 
diff --git a/bin/cp.pl b/bin/cp.pl
index 4c9b1c86..356bc7af 100755
--- a/bin/cp.pl
+++ b/bin/cp.pl
@@ -1392,11 +1392,6 @@ sub print_payments {
     %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;
@@ -1464,6 +1459,11 @@ sub print_form {
     ( $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";