diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 334a90d07c25686991a0039cdef9f0f8ff01db0a..5a2f8ef8cc2eb70cb89c6093c7ff0b4a79efe6b6 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -492,7 +492,7 @@ if ($_GET["action"] == 'create') print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="GET">'; print '<table class="border" width="100%">'; print '<tr><td>'.$langs->trans("Company").'</td><td>'; - $html->select_societes('','socid','s.fournisseur=0',1); + $html->select_societes('','socid','',1,1); print '</td></tr>'; print '<tr><td colspan="2" align="center">'; print '<input type="hidden" name="action" value="create">'; diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 77c0ea30b20964171ade9f0141f7f0150c2cfdc3..3229cad0b7d4b5ba6ef944b5766bf923e5df0431 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -553,8 +553,8 @@ class Form if ($showtype) { if ($obj->client || $obj->fournisseur) $label.=' ('; - if ($obj->client == 1) $label.=$langs->trans("Customer"); - if ($obj->client == 2) $label.=$langs->trans("Prospect"); + if ($obj->client == 1 || $obj->client == 3) $label.=$langs->trans("Customer"); + if ($obj->client == 2 || $obj->client == 3) $label.=($obj->client==3?', ':'').$langs->trans("Prospect"); if ($obj->fournisseur) $label.=($obj->client?', ':'').$langs->trans("Supplier"); if ($obj->client || $obj->fournisseur) $label.=')'; }