Merge branch 'bug-1577' of github.com:marcosgdf/dolibarr into

marcosgdf-bug-1577 Conflicts: ChangeLog
Dolibarr · Sep 14, 2014 · 2704f50 · 2704f50
2 parents f0d4ebe + afd631e
commit 2704f50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -27,6 +27,7 @@ Fix: Add code save on create event.
 Fix: SQL injection.
 Fix: [ bug #1589 ] Menu type in "Edit menu" page is not translated
 Fix: [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them
+Fix: [ bug #1577 ] When creating new Private individual third, selected third type is ignored
 
 ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
 Fix: Hide title of event when agenda module disabled.

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
@@ -159,14 +159,7 @@
 
         $object->forme_juridique_code  = GETPOST('forme_juridique_code');
         $object->effectif_id           = GETPOST('effectif_id');
-        if (GETPOST("private") == 1)
-        {
-            $object->typent_id         = dol_getIdFromCode($db,'TE_PRIVATE','c_typent');
-        }
-        else
-        {
-            $object->typent_id         = GETPOST('typent_id');
-        }
+        $object->typent_id         = GETPOST('typent_id');
 
         $object->client                = GETPOST('client');
         $object->fournisseur           = GETPOST('fournisseur');