Merge branch '11.0' of github.com:atm-florian/dolibarr into 11.0

2020-06-04 20:21:17 +02:00 · 2020-06-04 20:21:17 +02:00 · 29649a1e2a
commit 29649a1e2a
parent b47761e05c e9b17aac8d
2 changed files with 1 additions and 2 deletions
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@ -7976,7 +7976,7 @@ abstract class CommonObject
 	 * @return		int						<0 if KO, >0 if OK
 	 * @throws Exception
 	 */
-	public function deleteByParentField($parentId = 0, $parentField='')
+	public function deleteByParentField($parentId = 0, $parentField = '')
 	{
 		global $user;

--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@ -1708,7 +1708,6 @@ class Societe extends CommonObject
 							$this->errors[] = $this->db->lasterror();
 						}
 					}
-
 				}
 			}