diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 90c37aaaa6f590c5ecdcee6a17ce3e7b223f6db0..92e63c6fa6740f500ed0510e5e059b99b98751d9 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1247,7 +1247,7 @@ if ($action == 'create') else { print '<td colspan="2">'; - print $form->select_company('','socid','s.client = 1',1); + print $form->select_company('','socid','s.client = 1 OR s.client = 2 OR s.client = 3',1); print '</td>'; } print '</tr>'."\n"; diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index 0a46e2c31e229ac9ef61bf6439578f2ecd868779..e2752cebf90bf7bf507a365df34446e610ab3d57 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -168,7 +168,6 @@ abstract class ActionsCardCommon } $this->object->client = $_POST["client"]; $this->object->fournisseur = $_POST["fournisseur"]; - $this->object->fournisseur_categorie = $_POST["fournisseur_categorie"]; $this->object->commercial_id = $_POST["commercial_id"]; $this->object->default_lang = $_POST["default_lang"]; @@ -488,7 +487,6 @@ abstract class ActionsCardCommon $this->object->LoadSupplierCateg(); $this->tpl['suppliercategory'] = $this->object->SupplierCategories; - $this->tpl['select_suppliercategory'] = $form->selectarray("fournisseur_categorie",$this->object->SupplierCategories,$_POST["fournisseur_categorie"],1); } // Zip diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 7688eec0d66d4efde2b91c7d17685ea471ca6e25..4d45d8d01f95e6ac2a26f0b1fbc87c6db16ebb57 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -143,7 +143,8 @@ class Societe extends CommonObject var $array_options; var $oldcopy; - + + /** * Constructor * @@ -242,9 +243,6 @@ class Societe extends CommonObject $this->add_commercial($user, $user->id); } - // si le fournisseur est classe on l'ajoute - $this->AddFournisseurInCategory($this->fournisseur_categorie); - if ($ret >= 0) { // Appel des triggers @@ -610,9 +608,6 @@ class Societe extends CommonObject } } - // Si le fournisseur est classe on l'ajoute - $this->AddFournisseurInCategory($this->fournisseur_categorie); - // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! $hookmanager->initHooks(array('thirdpartydao')); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index cb62e16ab80f39e2ad5c46a48565fae8d2d691e0..11056d4381a5679b26d1fd0c92f19624fa97122e 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -162,7 +162,6 @@ if (empty($reshook)) $object->client = GETPOST('client'); $object->fournisseur = GETPOST('fournisseur'); - $object->fournisseur_categorie = GETPOST('fournisseur_categorie'); $object->commercial_id = GETPOST('commercial_id'); $object->default_lang = GETPOST('default_lang'); @@ -794,23 +793,6 @@ else print $form->textwithpicto('',$s,1); print '</td></tr></table>'; print '</td></tr>'; - - // Category - /* This must be set into category tab, like for customer category - if ($object->fournisseur) - { - $load = $object->LoadSupplierCateg(); - if ( $load == 0) - { - if (count($object->SupplierCategories) > 0) - { - print '<tr>'; - print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">'; - print $form->selectarray("fournisseur_categorie",$object->SupplierCategories,GETPOST('fournisseur_categorie'),1); - print '</td></tr>'; - } - } - }*/ } // Status @@ -1256,22 +1238,6 @@ else print '</td></tr></table>'; print '</td></tr>'; - - // Category - if (! empty($conf->categorie->enabled) && $object->fournisseur) - { - $load = $object->LoadSupplierCateg(); - if ( $load == 0) - { - if (count($object->SupplierCategories) > 0) - { - print '<tr>'; - print '<td>'.$langs->trans('SupplierCategory').'</td><td colspan="3">'; - print $form->selectarray("fournisseur_categorie",$object->SupplierCategories,'',1); - print '</td></tr>'; - } - } - } } // Barcode