Fix: task #11248 : there is no DB transaction on products->delete

Qual: Mutualize code to see of an object as child
Dolibarr · Aug 28, 2011 · be53335 · be53335
1 parent 058636e
commit be53335
Show file tree

Hide file tree

Showing 4 changed files with 521 additions and 522 deletions.
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
@@ -571,20 +571,6 @@ function delete($id)
     				}
                 }
 
-                if (! $error)
-                {
-    				$sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
-    				$sqlz.= " WHERE rowid = ".$id;
-                    dol_syslog(get_class($this).'::delete sql='.$sql, LOG_DEBUG);
-    				$resultz = $this->db->query($sqlz);
-       				if ( ! $resultz )
-    				{
-    					$error++;
-    					$this->error = $this->db->lasterror();
-    				    dol_syslog(get_class($this).'::delete error '.$this->error, LOG_ERR);
-    				}
-                }
-
                 if (! $error)
                 {
                 	// Actions on extra fields (by external module or standard code)
@@ -606,6 +592,21 @@ function delete($id)
                     }
                 }
 
+                // Delete product
+                if (! $error)
+                {
+    				$sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";
+    				$sqlz.= " WHERE rowid = ".$id;
+                    dol_syslog(get_class($this).'::delete sql='.$sql, LOG_DEBUG);
+    				$resultz = $this->db->query($sqlz);
+       				if ( ! $resultz )
+    				{
+    					$error++;
+    					$this->error = $this->db->lasterror();
+    				    dol_syslog(get_class($this).'::delete error '.$this->error, LOG_ERR);
+    				}
+                }
+
                 if (! $error)
                 {
                     // Appel des triggers