lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3278 from marcosgdf/bug-1634

Browse Source 
FIX [ bug 1634 ] Error deleting a project when it had many linked objects
This commit is contained in:
Laurent Destailleur 2015-07-19 15:26:45 +02:00
commit 8fa35fcb7b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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 #1852 ] JS error when editing a customer order line
FIX [ bug #2900 ] Courtesy title is not stored in create thirdparty form 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 #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.* ***** ***** ChangeLog for 3.7.1 compared to 3.7.* *****
FIX Bug in the new photo system FIX Bug in the new photo system

2
htdocs/projet/card.php
View File

@ -339,7 +339,7 @@ if (empty($reshook))
else else
{ {
dol_syslog($object->error,LOG_DEBUG); dol_syslog($object->error,LOG_DEBUG);
setEventMessage($object->error,'errors'); // setEventMessage($object->error,'errors');
setEventMessage($object->errors,'errors'); setEventMessage($object->errors,'errors');
} }
} }

2
htdocs/projet/class/project.class.php
View File

@ -533,7 +533,7 @@ class Project extends CommonObject
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) if (!$resql)
{ {
$this->errors[] = $this->db->lasterror(); $this->errors[] = $langs->trans("CantRemoveProject");
$error++; $error++;
} }
} }