diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 734e9d31f67..49a4daa3b3f 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -304,7 +304,7 @@ if (GETPOST('withtab','alpha')) dol_fiche_head($head, 'fingerprints', '', -1); } -print ''.$langs->trans("FingerprintsDesc")."
\n"; +print ''.$langs->trans("FingerprintsDesc")."
\n"; print '
'; @@ -342,7 +342,7 @@ for ($month = 1 ; $month <= 12 ; $month++) } $retstring.=""; print $retstring; -print ''; +print ''; print ''; print ''; if (!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY)) print ' | '.$langs->trans('DownloadBlockChain').''; diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index ed093e4c506..c5c2125750e 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -129,7 +129,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element] $html_id = !empty($object->id) ? $object->element.'_extras_'.$key.'_'.$object->id : ''; - print ''; + print ''; // Convert date into timestamp format if (in_array($extrafields->attributes[$object->table_element]['type'][$key], array('date','datetime'))) diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index adecb7604c8..e40474eb925 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -47,17 +47,17 @@ ContentsNotVisibleByAllShort=Contenu non visible par tous DeleteCategory=Effacer le(a) libellé/catégorie ConfirmDeleteCategory=Êtes-vous sûr de vouloir supprimer ce tag/catégorie ? NoCategoriesDefined=Aucun(e) tag/catégorie défini(e) -SuppliersCategoryShort=Tags/catégories de fournisseurs -CustomersCategoryShort=Tags/catégories de clients -ProductsCategoryShort=Tags/catégories de produits -MembersCategoryShort=Tags/catégories adhérents +SuppliersCategoryShort=Tag/catégorie de fournisseurs +CustomersCategoryShort=Tag/catégorie de clients +ProductsCategoryShort=Tag/catégorie de produits +MembersCategoryShort=Tag/catégorie adhérents SuppliersCategoriesShort=Tags fournisseurs CustomersCategoriesShort=Tags/catégories de clients ProspectsCategoriesShort=Tags/Catégories de prospects CustomersProspectsCategoriesShort=Tags clients/prosp. ProductsCategoriesShort=Tags/catégories de produits MembersCategoriesShort=Tags/catégories de membres -ContactCategoriesShort=Tags de contacts +ContactCategoriesShort=Tags/catégories de contacts AccountsCategoriesShort=Tag/catégorie des comptes ProjectsCategoriesShort=Tags/catégories de projets ThisCategoryHasNoProduct=Ce tag/catégorie ne contient aucun produit. diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 80427437488..cd923ee6dcd 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -1427,15 +1427,6 @@ else print ''; } - // Assign a sale representative - print ''; - print ''.fieldLabel('AllocateCommercial','commercial_id').''; - print ''; - $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1); - // Note: If user has no right to "see all thirdparties", we for selection of sale representative to him, so after creation he can see the record. - print $form->multiselectarray('commercial', $userlist, (count(GETPOST('commercial', 'array')) > 0?GETPOST('commercial', 'array'):(empty($user->rights->societe->client->voir)?array($user->id):array())), null, null, null, null, "90%"); - print ''; - // Incoterms if (!empty($conf->incoterm->enabled)) { @@ -1453,7 +1444,7 @@ else // Customer //if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) { - print '' . fieldLabel('CustomersCategoriesShort', 'custcats') . ''; + print '' . fieldLabel('CustomersProspectsCategoriesShort', 'custcats') . ''; $cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1); print $form->multiselectarray('custcats', $cate_arbo, GETPOST('custcats', 'array'), null, null, null, null, "90%"); print ""; @@ -1487,6 +1478,15 @@ else print $object->showOptionals($extrafields,'edit'); } + // Assign a sale representative + print ''; + print ''.fieldLabel('AllocateCommercial','commercial_id').''; + print ''; + $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1); + // Note: If user has no right to "see all thirdparties", we for selection of sale representative to him, so after creation he can see the record. + print $form->multiselectarray('commercial', $userlist, (count(GETPOST('commercial', 'array')) > 0?GETPOST('commercial', 'array'):(empty($user->rights->societe->client->voir)?array($user->id):array())), null, null, null, null, "90%"); + print ''; + // Ajout du logo print ''; print ''.fieldLabel('Logo','photoinput').''; @@ -2048,16 +2048,6 @@ else print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : ''; print '"> '.$langs->trans("Currency".$conf->currency).''; - // Assign a Name - print ''; - print ''.fieldLabel('AllocateCommercial','commercial_id').''; - print ''; - $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1); - $arrayselected = GETPOST('commercial', 'array'); - if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1); - print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%"); - print ''; - // Default language if (! empty($conf->global->MAIN_MULTILANGS)) { @@ -2067,6 +2057,16 @@ else print ''; } + // Incoterms + if (!empty($conf->incoterm->enabled)) + { + print ''; + print ''.fieldLabel('IncotermLabel','incoterm_id').''; + print ''; + print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); + print ''; + } + // Categories if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire)) { @@ -2124,16 +2124,6 @@ else print ''; } - // Incoterms - if (!empty($conf->incoterm->enabled)) - { - print ''; - print ''.fieldLabel('IncotermLabel','incoterm_id').''; - print ''; - print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); - print ''; - } - // Logo print ''; print ''.fieldLabel('Logo','photoinput').''; @@ -2152,6 +2142,16 @@ else print ''; print ''; + // Assign sale representative + print ''; + print ''.fieldLabel('AllocateCommercial','commercial_id').''; + print ''; + $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, '', 0, '', '', 0, 1); + $arrayselected = GETPOST('commercial', 'array'); + if (empty($arrayselected)) $arrayselected = $object->getSalesRepresentatives($user, 1); + print $form->multiselectarray('commercial', $userlist, $arrayselected, null, null, null, null, "90%"); + print ''; + print ''; print ''; @@ -2497,28 +2497,28 @@ else print ''; } - // Incoterms - if (!empty($conf->incoterm->enabled)) - { - print ''; - print '
'; - print $langs->trans('IncotermLabel'); - print ''; - if ($user->rights->societe->creer) print ''.img_edit('',1).''; - else print ' '; - print '
'; - print ''; - print ''; - if ($action != 'editincoterm') - { - print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1); - } - else - { - print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id); - } - print ''; - } + // Incoterms + if (!empty($conf->incoterm->enabled)) + { + print ''; + print '
'; + print $langs->trans('IncotermLabel'); + print ''; + if ($user->rights->societe->creer) print ''.img_edit('',1).''; + else print ' '; + print '
'; + print ''; + print ''; + if ($action != 'editincoterm') + { + print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1); + } + else + { + print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id); + } + print ''; + } // Multicurrency if (! empty($conf->multicurrency->enabled))