diff --git a/htdocs/adherents/messaging.php b/htdocs/adherents/messaging.php index 525d05c27a8..94f26360752 100644 --- a/htdocs/adherents/messaging.php +++ b/htdocs/adherents/messaging.php @@ -194,7 +194,7 @@ if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $cachekey = 'count_events_user_'.$object->id; $nbEvent = dol_getcache($cachekey); // TODO Add nb into badge in menu so we can get it from cache also here - $titlelist = $langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '('.$nbEvent.')' : ''); + $titlelist = $langs->trans("ActionsOnMember").(is_numeric($nbEvent) ? '('.$nbEvent.')' : ''); if (!empty($conf->dol_optimize_smallscreen)) { $titlelist = $langs->trans("Actions").(is_numeric($nbEvent) ? '('.$nbEvent.')' : ''); } diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 1a858f7f0c2..ef7e9b01501 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1743,7 +1743,7 @@ if ($action == 'create') { if ($objp->fk_product > 0) { $canchangeproduct = 1; - // TODO: As $canchangeproduct is set just before, in what usecase it can be empty ? + // @TODO: As $canchangeproduct is set just before, in what usecase it can be empty ? if (empty($canchangeproduct)) { $productstatic->id = $objp->fk_product; $productstatic->type = $objp->ptype; @@ -1753,9 +1753,9 @@ if ($action == 'create') { print $objp->label ? ' - '.dol_trunc($objp->label, 32) : ''; print ''; } else { - $senderissupplier = 0; + $senderissupplier = 0; // @TODO Option to allow purchased products ? if (empty($senderissupplier)) { - print $form->select_produits($currentLineProductId, 'idprod'); + print $form->select_produits($currentLineProductId, 'idprod', '', 0, 0, 1, 2, '', 0, array(), 0, 1, 0, 'minwidth250onall maxwidth500 widthcentpercentminusx'); } else { $form->select_produits_fournisseurs($currentLineProductId, 'idprod'); } @@ -1801,7 +1801,7 @@ if ($action == 'create') { } // Discount - print '