diff options
author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-01-20 04:08:23 +0000 |
---|---|---|
committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-01-20 04:08:23 +0000 |
commit | de9f9067cffc52c9ef818237bc52e77aa9f8b4be (patch) | |
tree | 0ef5642f7d33fc541bca12647718702368546393 /LedgerSMB | |
parent | ab7369d8a2a2605f2adbca0f1689b84f9d394cd4 (diff) |
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
Diffstat (limited to 'LedgerSMB')
-rwxr-xr-x | LedgerSMB/OE.pm | 2 |
1 files changed, 1 insertions, 1 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)|; |