Fixed sql error during sales order line update with line cancelation

(ported).

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f28debabc4cb66efe7b91baf44d2de4e4c392642..61c23aeeb1762cdd640cc227b4ad7e4132459a37 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+29-Sep-2009 Janusz Dobrowolski
+# Fixed sql error during sales order line update with line cancelation.
+$ /sales/includes/db/sales_order_db.inc
+
 29-Sep-2009 Joe Hunt
 ! Improved layout on documents etc and new empty language file.
 $ /doc/*.txt

diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc
index 39c67bedd2dfa8355cbe4335a431b87b51e00c6d..2d2e46964fd5616009d5c407577d06d97f203261 100644 (file)
--- a/sales/includes/db/sales_order_db.inc
+++ b/sales/includes/db/sales_order_db.inc
@@ -390,9 +390,7 @@ function close_sales_order($order_no)
 {
        // set the quantity of each item to the already sent quantity. this will mark item as closed.
        $sql = "UPDATE ".TB_PREF."sales_order_details
-               SET quantity = qty_sent,
-                       type = 0,
-                       WHERE order_no = $order_no AND trans_type=".ST_SALESORDER."";
+               SET quantity = qty_sent WHERE order_no = $order_no AND trans_type=".ST_SALESORDER."";
 
        db_query($sql, "The sales order detail record could not be updated");
 }