diff --git a/ChangeLog b/ChangeLog index 0002ce6b3fa..243b350ba85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ FIX [ bug #2855 ] Wrong translation key in localtax report page FIX [ bug #1852 ] JS error when editing a customer order line FIX [ bug #2900 ] Courtesy title is not stored in create thirdparty form FIX [ bug #3055 ] Product image thumbnails were not deleted after deleting the image +FIX [ bug 1634 ] Error deleting a project when it had many linked objects ***** ChangeLog for 3.7.1 compared to 3.7.* ***** FIX Bug in the new photo system diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 1c971ef9e35..00b3f54eab8 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -339,7 +339,7 @@ if (empty($reshook)) else { dol_syslog($object->error,LOG_DEBUG); - setEventMessage($object->error,'errors'); +// setEventMessage($object->error,'errors'); setEventMessage($object->errors,'errors'); } } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index a52a9f133e9..8d2068b4591 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -533,7 +533,7 @@ class Project extends CommonObject $resql = $this->db->query($sql); if (!$resql) { - $this->errors[] = $this->db->lasterror(); + $this->errors[] = $langs->trans("CantRemoveProject"); $error++; } }