Fixed db error on free hand credit invoice reedition.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a6592f3f336127eafcf1f25bb3b88ed395078145..f1a56419cbc6d8e7f07619bb696d8dab8616ecaf 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -29,6 +29,8 @@ $ /admin/inst_theme.php
   /install/index.php
 # Fixed mailing problems under PHP with Suhoshin patch (Michael Hahn)
 $ /reporting/includes/class.mail.inc
+# Fixed db error on freehand credit invoice reedition.
+$ /sales/includes/cart_class.inc
 
 ------------------------------- Release 2.3 RC3 --------------------------------
 26-Oct-2010 Janusz Dobrowolski

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 286cc3fdb1e4694f9e3497c22eb1b2db95931be2..286f9f373dcd89642d3f9f8ffe2e1eb8849177a1 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -185,10 +185,10 @@ class cart
                                        //      $this->customer_currency = $sodata["curr_code"];
                                                $this->delivery_to = $sodata["deliver_to"];
                                                $this->delivery_address = $sodata["delivery_address"];
-                                       }
                                        // child transaction reedition - update with parent info unless it is freehand
-                                       if (!$no_edit)
-                                               $this->set_parent_constraints($sodata, $trans_no[0]);
+                                               if (!$no_edit)
+                                                       $this->set_parent_constraints($sodata, $trans_no[0]);
+                                       }
                        }
                        // prepare qtys for derivative document entry (not used in display)
                        if($no_edit) {