diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index cc666f4c35b..f0ceb6dedea 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -70,7 +70,21 @@ if (preg_match('/del_(.*)/',$action,$reg)) dol_print_error($db); } } +//Set hide closed customer into combox or select +if ($action == 'sethideinactiveuser') +{ + $status = GETPOST('status','alpha'); + if (dolibarr_set_const($db, "USER_HIDE_INACTIVE_IN_COMBOBOX",$status,'chaine',0,'',$conf->entity) > 0) + { + header("Location: ".$_SERVER["PHP_SELF"]); + exit; + } + else + { + dol_print_error($db); + } +} /* * View @@ -121,6 +135,27 @@ else } print ''; +/* +// USER_USE_SEARCH_TO_SELECT +$var=!$var; +print ""; +print ''.$langs->trans("HideClosedUserComboBox").''; +print ' '; +if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) +{ + print ''; + print img_picto($langs->trans("Activated"),'switch_on'); + print ''; +} +else +{ + print ''; + print img_picto($langs->trans("Disabled"),'switch_off'); + print ''; +} +print ''; +*/ + print ''; dol_fiche_end(); diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 3b655f726f7..7f50eaabd7e 100644 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -93,7 +93,7 @@ if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC)) if ($action == 'delete') { $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid); - $file = $upload_dir . '/' . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). + $file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). $ret=dol_delete_file($file,0,0,0,$act); if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile'))); else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors'); diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 834c651c2be..58aee255312 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -141,8 +141,8 @@ if (! $sortorder) $sortorder='DESC'; $limit = $conf->liste_limit; -$sql = 'SELECT s.rowid, s.nom, s.town, s.client, s.code_client'; -$sql.= 'p.rowid as propalid, p.note_private, p.total_ht, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,'; +$sql = 'SELECT s.rowid, s.nom, s.town, s.client, s.code_client,'; +$sql.= ' p.rowid as propalid, p.note_private, p.total_ht, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,'; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,"; $sql.= ' u.login'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'propal as p'; diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 61f722a1773..1a1049c8bcc 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -58,7 +58,7 @@ class Contact extends CommonObject var $country; // Label of country var $socid; // fk_soc - var $statut; // 0=brouillon, 1=4=actif, 5=inactif + var $statut; // 0=inactif, 1=actif var $code; var $email; @@ -125,6 +125,7 @@ class Contact extends CommonObject $sql.= ", firstname"; $sql.= ", fk_user_creat"; $sql.= ", priv"; + $sql.= ", statut"; $sql.= ", canvas"; $sql.= ", entity"; $sql.= ", import_key"; @@ -136,6 +137,7 @@ class Contact extends CommonObject $sql.= "'".$this->db->escape($this->firstname)."',"; $sql.= " ".($user->id > 0 ? "'".$user->id."'":"null").","; $sql.= " ".$this->priv.","; + $sql.= " ".$this->statut.","; $sql.= " ".(! empty($this->canvas)?"'".$this->canvas."'":"null").","; $sql.= " ".$conf->entity.","; $sql.= " ".(! empty($this->import_key)?"'".$this->import_key."'":"null"); @@ -229,6 +231,7 @@ class Contact extends CommonObject $this->town=(empty($this->town)?'':$this->town); $this->country_id=($this->country_id > 0?$this->country_id:$this->country_id); $this->state_id=($this->state_id > 0?$this->state_id:$this->fk_departement); + if (empty($this->statut)) $this->statut = 0; $this->db->begin(); @@ -253,6 +256,7 @@ class Contact extends CommonObject $sql .= ", phone_mobile = ".(isset($this->phone_mobile)?"'".$this->db->escape($this->phone_mobile)."'":"null"); $sql .= ", jabberid = ".(isset($this->jabberid)?"'".$this->db->escape($this->jabberid)."'":"null"); $sql .= ", priv = '".$this->priv."'"; + $sql .= ", statut = ".$this->statut; $sql .= ", fk_user_modif=".($user->id > 0 ? "'".$user->id."'":"NULL"); $sql .= ", default_lang=".($this->default_lang?"'".$this->default_lang."'":"NULL"); $sql .= ", no_email=".($this->no_email?"'".$this->no_email."'":"0"); @@ -933,45 +937,35 @@ class Contact extends CommonObject if ($mode == 0) { - if ($statut==0) return $langs->trans('StatusContactDraft'); - elseif ($statut==1) return $langs->trans('StatusContactValidated'); - elseif ($statut==4) return $langs->trans('StatusContactValidated'); - elseif ($statut==5) return $langs->trans('StatusContactValidated'); + if ($statut==0) return $langs->trans('Disabled'); + elseif ($statut==1) return $langs->trans('Enabled'); } elseif ($mode == 1) { - if ($statut==0) return $langs->trans('StatusContactDraftShort'); - elseif ($statut==1) return $langs->trans('StatusContactValidatedShort'); - elseif ($statut==4) return $langs->trans('StatusContactValidatedShort'); - elseif ($statut==5) return $langs->trans('StatusContactValidatedShort'); + if ($statut==0) return $langs->trans('Disabled'); + elseif ($statut==1) return $langs->trans('Enabled'); } elseif ($mode == 2) { - if ($statut==0) return img_picto($langs->trans('StatusContactDraftShort'),'statut0').' '.$langs->trans('StatusContactDraft'); - elseif ($statut==1) return img_picto($langs->trans('StatusContactValidatedShort'),'statut1').' '.$langs->trans('StatusContactValidated'); - elseif ($statut==4) return img_picto($langs->trans('StatusContactValidatedShort'),'statut4').' '.$langs->trans('StatusContactValidated'); - elseif ($statut==5) return img_picto($langs->trans('StatusContactValidatedShort'),'statut5').' '.$langs->trans('StatusContactValidated'); + if ($statut==0) return img_picto($langs->trans('Disabled'),'statut1').' '.$langs->trans('Disabled'); + elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); + } elseif ($mode == 3) { - if ($statut==0) return img_picto($langs->trans('StatusContactDraft'),'statut0'); - elseif ($statut==1) return img_picto($langs->trans('StatusContactValidated'),'statut1'); - elseif ($statut==4) return img_picto($langs->trans('StatusContactValidated'),'statut4'); - elseif ($statut==5) return img_picto($langs->trans('StatusContactValidated'),'statut5'); + if ($statut==0) return img_picto($langs->trans('Disabled'),'statut1'); + elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4'); + } elseif ($mode == 4) { - if ($statut==0) return img_picto($langs->trans('StatusContactDraft'),'statut0').' '.$langs->trans('StatusContactDraft'); - elseif ($statut==1) return img_picto($langs->trans('StatusContactValidated'),'statut1').' '.$langs->trans('StatusContactValidated'); - elseif ($statut==4) return img_picto($langs->trans('StatusContactValidated'),'statut4').' '.$langs->trans('StatusContactValidated'); - elseif ($statut==5) return img_picto($langs->trans('StatusContactValidated'),'statut5').' '.$langs->trans('StatusContactValidated'); + if ($statut==0) return img_picto($langs->trans('Disabled'),'statut1').' '.$langs->trans('StatusContactDraft'); + elseif ($statut==1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); } elseif ($mode == 5) { - if ($statut==0) return ''.$langs->trans('StatusContactDraftShort').' '.img_picto($langs->trans('StatusContactDraftShort'),'statut0'); - elseif ($statut==1) return ''.$langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut1'); - elseif ($statut==4) return ''.$langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut4'); - elseif ($statut==5) return ''.$langs->trans('StatusContactValidatedShort').' '.img_picto($langs->trans('StatusContactValidatedShort'),'statut5'); + if ($statut==0) return ''.$langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut1'); + elseif ($statut==1) return ''.$langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4'); } } diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index b678d38c3b0..fb30b32a67d 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -178,6 +178,7 @@ if (empty($reshook)) $object->priv = $_POST["priv"]; $object->note_public = GETPOST("note_public"); $object->note_private = GETPOST("note_private"); + $object->statut = 1; //Defult status to Actif // Note: Correct date should be completed with location to have exact GM time of birth. $object->birthday = dol_mktime(0,0,0,$_POST["birthdaymonth"],$_POST["birthdayday"],$_POST["birthdayyear"]); diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 686e8766b44..529b9cb69b9 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -283,7 +283,7 @@ if ($result) print_liste_field_titre($langs->trans("EMail"),$_SERVER["PHP_SELF"],"p.email", $begin, $param, '', $sortfield,$sortorder); print_liste_field_titre($langs->trans("DateModificationShort"),$_SERVER["PHP_SELF"],"p.tms", $begin, $param, 'align="center"', $sortfield,$sortorder); print_liste_field_titre($langs->trans("ContactVisibility"),$_SERVER["PHP_SELF"],"p.priv", $begin, $param, 'align="center"', $sortfield,$sortorder); - + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"p.statut", $begin, $param, 'align="center"', $sortfield,$sortorder); print ' '; print "\n"; @@ -321,6 +321,7 @@ if ($result) $selectarray=array('0'=>$langs->trans("ContactPublic"),'1'=>$langs->trans("ContactPrivate")); print $form->selectarray('search_priv',$selectarray,$search_priv,1); print ''; + print ' '; print ''; print ''; print '  '; @@ -332,10 +333,8 @@ if ($result) while ($i < min($num,$limit)) { $obj = $db->fetch_object($result); - - if ($obj->statut == 1) - { - $var=!$var; + + $var=!$var; print ""; // Name @@ -343,6 +342,7 @@ if ($result) $contactstatic->lastname=$obj->lastname; $contactstatic->firstname=''; $contactstatic->id=$obj->cidp; + $contactstatic->statut=$obj->statut; print $contactstatic->getNomUrl(1,'',20); print ''; @@ -382,6 +382,9 @@ if ($result) // Private/Public print ''.$contactstatic->LibPubPriv($obj->priv).''; + + // Status + print ''.$contactstatic->getLibStatut(3).''; // Links Add action and Export vcard print ''; @@ -392,7 +395,6 @@ if ($result) print ''; print "\n"; - } $i++; } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 37dd19ffe04..dc8ca8a30be 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -975,6 +975,7 @@ class Form } $sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")"; if ($socid > 0) $sql.= " AND sp.fk_soc=".$socid; + if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0 "; $sql.= " ORDER BY sp.lastname ASC"; dol_syslog(get_class($this)."::select_contacts sql=".$sql); @@ -1141,6 +1142,7 @@ class Form if (! empty($user->societe_id)) $sql.= " AND u.fk_societe = ".$user->societe_id; if (is_array($exclude) && $excludeUsers) $sql.= " AND u.rowid NOT IN ('".$excludeUsers."')"; if (is_array($include) && $includeUsers) $sql.= " AND u.rowid IN ('".$includeUsers."')"; + if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut<>0 "; $sql.= " ORDER BY u.lastname ASC"; dol_syslog(get_class($this)."::select_dolusers sql=".$sql); diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index de9fb91a6f3..cb8dace1734 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -2,6 +2,7 @@ /* Copyright (c) 2008-2013 Laurent Destailleur * Copyright (C) 2010-2012 Regis Houssin * Copyright (c) 2010 Juanjo Menent + * Copyright (c) 2013 Charles-Fr BENKE * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -732,8 +733,16 @@ class FormFile print ''; + //print '&file='.urlencode($relativepath.$file['name']).'">'; + if ($file['level1name'] <> $object->id) + $filepath=urlencode($object->id.'/'.$file['level1name'].'/'.$file['name']); + else + $filepath=urlencode($object->id.'/'.$file['name']); + print '&file='.$filepath.'">'; + print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' '; + if ($file['level1name'] <> $object->id) + print $file['level1name'].'/'; print dol_trunc($file['name'],$maxlength,'middle'); print ''; print "\n"; @@ -753,7 +762,14 @@ class FormFile // ($param must start with &) print ''; if ($useinecm) print ''.img_view().'   '; - if ($permtodelete) print ''.img_delete().''; + if ($permtodelete) + { + if ($file['level1name'] <> $object->id) + $filepath=urlencode($file['level1name'].'/'.$file['name']); + else + $filepath=urlencode($file['name']); + print ''.img_delete().''; + } else print ' '; print ""; print "\n"; diff --git a/htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css b/htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css index 1b3742a683b..6c7542d9010 100644 --- a/htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css +++ b/htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css @@ -53,6 +53,13 @@ position: absolute; top: 0; /* #8656 */ cursor: default; + max-height: 400px; + overflow-y: auto; + /* prevent horizontal scrollbar */ + overflow-x: hidden; + /* add padding to account for vertical scrollbar */ + padding-right: 20px; + } /* workarounds */ diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql index 889e606c4fe..e417a408d50 100755 --- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql +++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql @@ -316,3 +316,16 @@ create table llx_contrat_extrafields -- add outstanding bill ALTER TABLE llx_societe ADD outstanding_limit double(24,8) DEFAULT NULL AFTER mode_reglement_supplier; +UPDATE llx_const SET name='COMPANY_DONOTSEARCH_ANYWHERE' WHERE name='SOCIETE_DONOTSEARCH_ANYWHERE'; + +--Task 172 +create table llx_actioncomm_resources +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_actioncomm integer NOT NULL, + element_type varchar(50) NOT NULL, + fk_element integer NOT NULL, + fk_element_status varchar(32) NULL +) ENGINE=innodb; +ALTER TABLE llx_actioncomm_resources ADD UNIQUE INDEX idx_actioncomm_resources_idx1 (fk_actioncomm, element_type, fk_element); +ALTER TABLE llx_actioncomm_resources ADD INDEX idx_actioncomm_resources_fk_element (fk_element); diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql new file mode 100644 index 00000000000..6d6999e7232 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.key.sql @@ -0,0 +1,25 @@ +-- ============================================================================ +-- Copyright (C) 2013 Laurent Destailleur +-- Copyright (C) 2013 Florian Henry +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + + +ALTER TABLE llx_actioncomm_resources ADD UNIQUE INDEX idx_actioncomm_resources_idx1 (fk_actioncomm, element_type, fk_element); +ALTER TABLE llx_actioncomm_resources ADD INDEX idx_actioncomm_resources_fk_element (fk_element); + +-- Pas de contraite sur fk_source et fk_target car pointe sur differentes tables + diff --git a/htdocs/install/mysql/tables/llx_actioncomm_resources.sql b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql new file mode 100644 index 00000000000..781744e7c60 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_actioncomm_resources.sql @@ -0,0 +1,30 @@ +-- ============================================================================ +-- Copyright (C) 2013 Laurent Destailleur +-- Copyright (C) 2013 Florian Henry +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ +-- Table used for relations between elements of different types: +-- invoice-propal, propal-order, etc... +-- ============================================================================ + +create table llx_actioncomm_resources +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_actioncomm integer NOT NULL, + element_type varchar(50) NOT NULL, + fk_element integer NOT NULL, + fk_element_status varchar(32) NULL +) ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql index c46a7ef3aca..00e6f50f61b 100644 --- a/htdocs/install/mysql/tables/llx_socpeople.sql +++ b/htdocs/install/mysql/tables/llx_socpeople.sql @@ -51,5 +51,5 @@ create table llx_socpeople default_lang varchar(6), canvas varchar(32), -- type of canvas if used (null by default) import_key varchar(14), - statut tinyint + statut tinyint DEFAULT 1 NOT NULL )ENGINE=innodb; diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 1ef41fc0c56..3dc0904561f 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -49,7 +49,7 @@ Dictionnary=Речници # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Изключване на JavaScript и Ajax функции ConfirmAjax=Използвайте Аякс потвърждение изскачащи прозорци -UseSearchToSelectCompany=Използвайте Автоматично завършване на полета, за да изберете трети страни (вместо да използвате списъчно поле).

Също така, ако имате голям брой трети страни (> 100 000), можете да увеличите скоростта чрез създаване на постоянна SOCIETE_DONOTSEARCH_ANYWHERE 1 в Setup->. Търсене след това ще бъдат ограничени до началото на низ. +UseSearchToSelectCompany=Използвайте Автоматично завършване на полета, за да изберете трети страни (вместо да използвате списъчно поле).

Също така, ако имате голям брой трети страни (> 100 000), можете да увеличите скоростта чрез създаване на постоянна COMPANY_DONOTSEARCH_ANYWHERE 1 в Setup->. Търсене след това ще бъдат ограничени до началото на низ. ActivityStateToSelectCompany= Добавяне на филтър опция за показване / скриване на thirdparties, които в момента са в дейност или е престанала # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Филтрите за търсене опции diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 856995336a3..afe3157eb13 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està ErrorCodeCantContainZero=El codi no pot contenir el valor 0 DisableJavascript=Desactivar les funcions Javascript ConfirmAjax=Utilitzar els popups de confirmació Ajax -UseSearchToSelectCompany=Utilitzar un formulari de cerca per buscar tercers (en comptes de llista desplegable)

Tingueu en compte que si té un gran nombre de productes o serveis (> 100 000), pot millorar el rendiment mitjançant la constant SOCIETE_DONOTSEARCH_ANYWHERE a 1 a Configuració-> Varis. La recerca es limitarà llavors a l'inici de la cadena. +UseSearchToSelectCompany=Utilitzar un formulari de cerca per buscar tercers (en comptes de llista desplegable)

Tingueu en compte que si té un gran nombre de productes o serveis (> 100 000), pot millorar el rendiment mitjançant la constant COMPANY_DONOTSEARCH_ANYWHERE a 1 a Configuració-> Varis. La recerca es limitarà llavors a l'inici de la cadena. ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir UseSearchToSelectContact=Utilitzar un formulari de cerca (en lloc d'una llista desplegable).
Tingueu en compte que si té un gran nombre de contactes (> 100 000), pot millorar el rendiment mitjançant la constant CONTACT_DONOTSEARCH_ANYWHERE a 1 a Configuració-> Diversos. La recerca es limitarà llavors a l'inici de la cadena. SearchFilter=Opcions filtres de cerca diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index df6858d353b..70ec831c7dd 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Hodnota "systém" a "systemauto ErrorCodeCantContainZero=Kód může obsahovat hodnotu 0 DisableJavascript=Zakázat JavaScript a Ajax funkce ConfirmAjax=Použití Ajax potvrzení vyskakovací okna -UseSearchToSelectCompany=Používejte automatické doplňování polí vybrat třetí strany (namísto použití pole se seznamem).

Také, pokud máte velký počet třetích stran (> 100 000), můžete zvýšit rychlost nastavením konstantní SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavení-> Ostatní. Vyhledávání pak bude omezen na začátek řetězce. +UseSearchToSelectCompany=Používejte automatické doplňování polí vybrat třetí strany (namísto použití pole se seznamem).

Také, pokud máte velký počet třetích stran (> 100 000), můžete zvýšit rychlost nastavením konstantní COMPANY_DONOTSEARCH_ANYWHERE na 1 v Nastavení-> Ostatní. Vyhledávání pak bude omezen na začátek řetězce. ActivityStateToSelectCompany= Přidat možnost filtru pro zobrazení / skrytí thirdparties, které jsou v současné době v činnosti nebo přestal ji UseSearchToSelectContact=Používejte automatické doplňování polí vyberte kontakt (namísto použití pole se seznamem).

Také, pokud máte velký počet třetích stran (> 100 000), můžete zvýšit rychlost nastavením konstantní CONTACT_DONOTSEARCH_ANYWHERE na 1 v Nastavení-> Ostatní. Vyhledávání pak bude omezen na začátek řetězce. SearchFilter=Hledat filtry možnosti diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 654047ac05a..7efb26f9beb 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» γι ErrorCodeCantContainZero=Κώδικας δεν μπορεί να περιέχει την τιμή 0 DisableJavascript=Απενεργοποίηση συναρτήσεων JavaScript και Ajax ConfirmAjax=Χρήση διαλόγων επιβεβαίωσης Ajax -UseSearchToSelectCompany=Χρήση φόρμας αναζήτησης για επιλογή εταιρίας (αντί χρήσης πλαισίων λίστας). Αν έχετε μεγάλο αριθμό στοιχείων (>100000) μπορείτε να αυξήσετε την ταχύτητα θέτοντας την μεταβλητή SOCIETE_DONOTSEARCH_ANYWHERE σε 1 στο μενού Ρυθμίσεις -> Άλλες Ρυθμίσεις +UseSearchToSelectCompany=Χρήση φόρμας αναζήτησης για επιλογή εταιρίας (αντί χρήσης πλαισίων λίστας). Αν έχετε μεγάλο αριθμό στοιχείων (>100000) μπορείτε να αυξήσετε την ταχύτητα θέτοντας την μεταβλητή COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο μενού Ρυθμίσεις -> Άλλες Ρυθμίσεις ActivityStateToSelectCompany= Προσθέστε μια επιλογή φίλτρου για εμφάνιση / απόκρυψη τρίτα μέρη τα οποία βρίσκονται σε λειτουργία ή έχει παύσει UseSearchToSelectContact=Χρησιμοποιήστε τα πεδία αυτόματης συμπλήρωσης για να επιλέξετε επαφή (αντί να χρησιμοποιήσετε ένα πλαίσιο λίστας).

Επίσης, αν έχετε ένα μεγάλο αριθμό τρίτων (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τη σταθερή CONTACT_DONOTSEARCH_ANYWHERE στο 1 στην Εγκατάσταση->Άλλα. Η αναζήτηση μετά θα περιορίζεται απο την έναρξη της συμβολοσειράς. SearchFilter=Αναζήτηση επιλογές φίλτρων diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e7235011263..3aaba60e9e0 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is re ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript and Ajax functions ConfirmAjax=Use Ajax confirmation popups -UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant SOCIETE_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Search filters options diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 086ee40962c..6ad5e2f2005 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=El uso del tipo 'system' y 'systemauto' está ErrorCodeCantContainZero=El código no puede contener el valor 0 DisableJavascript=Desactivar las funciones Javascript ConfirmAjax=Utilizar los popups de confirmación Ajax -UseSearchToSelectCompany=Utilizar un formulario de búsqueda para buscar terceros (en vez de lista desplegable)

Tenga en cuenta que si tiene un gran número de productos o servicios (>100 000), puede mejorar el rendimiento mediante la constante SOCIETE_DONOTSEARCH_ANYWHERE a 1 en Configuración->Varios. La búsqueda se limitará entonces al inicio de la cadena. +UseSearchToSelectCompany=Utilizar un formulario de búsqueda para buscar terceros (en vez de lista desplegable)

Tenga en cuenta que si tiene un gran número de productos o servicios (>100 000), puede mejorar el rendimiento mediante la constante COMPANY_DONOTSEARCH_ANYWHERE a 1 en Configuración->Varios. La búsqueda se limitará entonces al inicio de la cadena. ActivityStateToSelectCompany= Agregar un filtro en la búsqueda para mostrar/ocultar los terceros en activo o que hayan dejado de ejercer UseSearchToSelectContact=Utilizar un formulario de búsqueda (en vez de una lista desplegable).
Tenga en cuenta que si tiene un gran número de contactos (>100 000), puede mejorar el rendimiento mediante la constante CONTACT_DONOTSEARCH_ANYWHERE a 1 en Configuración->Varios. La búsqueda se limitará entonces al inicio de la cadena. SearchFilter=Opciones filtros de búsqueda diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 167f89b8dd3..f2da96455e8 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=Dictionary setup # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Keela JavaScript ja Ajax funktsioonid ConfirmAjax=Kasuta Ajax kinnituse hüpikaknad -UseSearchToSelectCompany=Kasuta sõnalõpetusteks väljad valida kolmandate isikute (selle asemel loendiboksis).

Samuti kui teil on suur hulk kolmandaid isikuid (> 100 000), saate suurendada kiirust, millega pidev SOCIETE_DONOTSEARCH_ANYWHERE kuni 1 aasta Setup-> Teised. Otsi siis piirdub algus string. +UseSearchToSelectCompany=Kasuta sõnalõpetusteks väljad valida kolmandate isikute (selle asemel loendiboksis).

Samuti kui teil on suur hulk kolmandaid isikuid (> 100 000), saate suurendada kiirust, millega pidev COMPANY_DONOTSEARCH_ANYWHERE kuni 1 aasta Setup-> Teised. Otsi siis piirdub algus string. ActivityStateToSelectCompany= Lisa filter võimalus näidata / peita thirdparties mis on praegu tegevust või lõpetas ta # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Otsi filtrite valikud diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 9984beaf503..1c27019bce1 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' s ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0 DisableJavascript=Désactiver les fonctions Javascript et Ajax ConfirmAjax=Utiliser les fenêtres de confirmation Ajax -UseSearchToSelectCompany=Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante).

Notez que si vous avez un nombre important de tiers (> 100 000), vous pouvez améliorer les performances en définissant la constante SOCIETE_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaîne. +UseSearchToSelectCompany=Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante).

Notez que si vous avez un nombre important de tiers (> 100 000), vous pouvez améliorer les performances en définissant la constante COMPANY_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaîne. ActivityStateToSelectCompany= Ajouter une option de filtrage lors des recherches pour afficher/masquer les tiers en exercice ou ayant cessé d'exercer UseSearchToSelectContact=Utiliser un champ avec autocomplétion pour choisir un contact (plutôt qu'une liste déroulante).

Notez que si vous avez un nombre important de contacts (> 100 000), vous pouvez améliorer les performances en définissant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaîne. SearchFilter=Options des filtres de recherche diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 061a1f23e44..bdb2ef07c6a 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=הגדרת מילון # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=בטל פונקציונליות של JavaScript ו Ajax ConfirmAjax=השתמש קופצים אייאקס אישור -UseSearchToSelectCompany=להשתמש בשדות השלמה אוטומטית לבחור צדדים שלישיים (ולא באמצעות תיבת רשימה).

גם אם יש לך מספר רב של צדדים שלישיים (> 100 000), תוכל להגדיל את המהירות על ידי הגדרת SOCIETE_DONOTSEARCH_ANYWHERE מתמיד 1 בהתקנת-> אחר. חיפוש לאחר מכן ניתן יהיה להתחיל מוגבל של מחרוזת. +UseSearchToSelectCompany=להשתמש בשדות השלמה אוטומטית לבחור צדדים שלישיים (ולא באמצעות תיבת רשימה).

גם אם יש לך מספר רב של צדדים שלישיים (> 100 000), תוכל להגדיל את המהירות על ידי הגדרת COMPANY_DONOTSEARCH_ANYWHERE מתמיד 1 בהתקנת-> אחר. חיפוש לאחר מכן ניתן יהיה להתחיל מוגבל של מחרוזת. ActivityStateToSelectCompany= הוספת אפשרות סינון להראות / להסתיר thirdparties שהם כיום בפעילות או חדל זה # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=מסננים אפשרויות חיפוש diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 72e0eb88bc7..4bae391a48d 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=Szótár beállítási # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Disable JavaScript és Ajax funkciókkal ConfirmAjax=Használja Ajax visszaigazolást popup -UseSearchToSelectCompany=Használja az automata kiegészítés mezőket választani harmadik fél (helyett egy lista).

Akkor is, ha van egy nagy számú harmadik felek (> 100 000), akkor a sebesség növelése azáltal, hogy állandó SOCIETE_DONOTSEARCH_ANYWHERE 1. Beállítás-> Egyéb. Keresés csak ezután kezdeni a húr. +UseSearchToSelectCompany=Használja az automata kiegészítés mezőket választani harmadik fél (helyett egy lista).

Akkor is, ha van egy nagy számú harmadik felek (> 100 000), akkor a sebesség növelése azáltal, hogy állandó COMPANY_DONOTSEARCH_ANYWHERE 1. Beállítás-> Egyéb. Keresés csak ezután kezdeni a húr. ActivityStateToSelectCompany= Hozzáadása lehetőséget, hogy a szűrő / elrejtése thirdparties, amelyek jelenleg a tevékenység megszűnt, vagy azt # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Keresés szűrők lehetőségek diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index ee77b07cac3..9f1414bbd1b 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=辞書のセットアップ # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=JavaScriptとAjaxの機能を無効にする ConfirmAjax=Ajaxの確認のポップアップを使用して、 -UseSearchToSelectCompany=第三者が（代わりにリストボックスを使用）を選択するオートコンプリートフィールドを使用します。

あなたがサードパーティの多数（> 100,000）を持っている場合にも、セットアップ - >その他1に定数SOCIETE_DONOTSEARCH_ANYWHEREを設定することにより、速度を上げることができます。検索は、文字列の先頭に制限されます。 +UseSearchToSelectCompany=第三者が（代わりにリストボックスを使用）を選択するオートコンプリートフィールドを使用します。

あなたがサードパーティの多数（> 100,000）を持っている場合にも、セットアップ - >その他1に定数COMPANY_DONOTSEARCH_ANYWHEREを設定することにより、速度を上げることができます。検索は、文字列の先頭に制限されます。 ActivityStateToSelectCompany= 活動に現在thirdparties表示/非表示切り替えフィルタオプションを追加したり、それを停止している # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=検索フィルタのオプション diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 3b94e9608a8..31f1adbd856 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -49,7 +49,7 @@ VersionLastUpgrade=최종 버전 업그레이드 # ErrorCodeCantContainZero=Code can't contain value 0 # DisableJavascript=Disable JavaScript and Ajax functions # ConfirmAjax=Use Ajax confirmation popups -# UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant SOCIETE_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +# UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. # ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. # SearchFilter=Search filters options diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang index 8e8404a45fa..72575d0a8ad 100644 --- a/htdocs/langs/nl_BE/admin.lang +++ b/htdocs/langs/nl_BE/admin.lang @@ -46,7 +46,7 @@ ErrorDecimalLargerThanAreForbidden = Fout, een nauwkeurigheid van meer dan %s DictionnarySetup = Woordenlijsten DisableJavascript = Schakel JavaScript en Ajax-functies uit ConfirmAjax = Gebruik Ajax bevestiging popups -UseSearchToSelectCompany = Gebruik velden die automatisch aanvullen om een bedrijf te kiezen (in plaats van een drop-down lijst).

In geval van een zeer groot aantal derde partijen (> 100 000), kan de snelheid verhoogt worden door de waarde SOCIETE_DONOTSEARCH_ANYWHERE op 1 te zetten in Home->Configuratie->Andere Instellingen. +UseSearchToSelectCompany = Gebruik velden die automatisch aanvullen om een bedrijf te kiezen (in plaats van een drop-down lijst).

In geval van een zeer groot aantal derde partijen (> 100 000), kan de snelheid verhoogt worden door de waarde COMPANY_DONOTSEARCH_ANYWHERE op 1 te zetten in Home->Configuratie->Andere Instellingen. ActivityStateToSelectCompany = Voeg een filter optie toe om derde partijen te tonen/verbergen die momenteel actief zijn of gestopt zijn SearchFilter = Opties voor de zoekfilters NumberOfKeyToSearch = Aantal karakters om de zoekactie te starten: %s diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 20be7888384..217f4ec0095 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=Constanten # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Schakel JavaScript en AJAX-functionaliteit uit ConfirmAjax=Gebruik AJAX bevestigingspopups -UseSearchToSelectCompany=Gebruik 'autocompletion' velden om derde partijen te kiezen (In plaats van een selectielijst).

Wanneer u een groot aantal derde partijen (meer dan 100.000) heeft, kunt u de snelheid verhogen door de constante SOCIETE_DONOTSEARCH_ANYWHERE op 1 in te stellen in Home->Instellingen->Overige instellingen. Het zoeken wordt dan beperkt tot het begin van een regel. +UseSearchToSelectCompany=Gebruik 'autocompletion' velden om derde partijen te kiezen (In plaats van een selectielijst).

Wanneer u een groot aantal derde partijen (meer dan 100.000) heeft, kunt u de snelheid verhogen door de constante COMPANY_DONOTSEARCH_ANYWHERE op 1 in te stellen in Home->Instellingen->Overige instellingen. Het zoeken wordt dan beperkt tot het begin van een regel. ActivityStateToSelectCompany= Voeg een filter optie voor het tonen / verbergen thirdparties die momenteel in de activiteiten of niet langer het # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Zoekfilters opties diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index 915dc750fc6..77a031c79b2 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -50,12 +50,12 @@ SupplierIsInCategories=Klant is eigenaar van de volgende leverancierscategorieë CompanyIsInCustomersCategories=Deze Klant is eigenaar van de volgende afnemers- / prospectencategorieën CompanyIsInSuppliersCategories=Deze Klant is eigenaar van de volgende leverancierscategorieën MemberIsInCategories=Dit lid is eigenaar van de volgende ledencategorieën -# ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=Dit contact kent de volgende contacts Categorieën ProductHasNoCategory=Dit product / dienst behoort tot geen enkele categorie SupplierHasNoCategory=Deze leverancier behoort tot geen enkele categorie CompanyHasNoCategory=Dit bedrijf behoort tot geen enkele categorie MemberHasNoCategory=Dit lid behoort tot geen enkele categorie -# ContactHasNoCategory=This contact is not in any categories +ContactHasNoCategory=Dit contact is niet in een Categorieën onderverdeeld ClassifyInCategory=Classificeren naar categorie NoneCategory=Geen # NotCategorized=Without category @@ -81,7 +81,7 @@ CustomersCategoriesShort=Afnemerscategorie CustomersProspectsCategoriesShort=Afnemers- / Prospectencategorie ProductsCategoriesShort=Productencategorie MembersCategoriesShort=Ledencategorie -# ContactCategoriesShort=Contacts categories +ContactCategoriesShort=Contact Categorieën ThisCategoryHasNoProduct=Deze categorie bevat geen producten. ThisCategoryHasNoSupplier=Deze categorie bevat geen enkele leverancier. ThisCategoryHasNoCustomer=Deze categorie bevat geen enkele afnemer. @@ -96,7 +96,7 @@ CatSupList=Leverancierscategorieënlijst CatCusList=afnemers- / prospectencategorieënlijst CatProdList=productencategorieënlijst CatMemberList=Ledencategorieënlijst -# CatContactList=List of contact categories and contact +CatContactList=Lijst van Categorieën van Contacten # CatSupLinks=Links between suppliers and categories # CatCusLinks=Links between customers/prospects and categories # CatProdLinks=Links between products/services and categories diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang index 70e208c255e..aabc90b5f12 100644 --- a/htdocs/langs/nl_NL/mails.lang +++ b/htdocs/langs/nl_NL/mails.lang @@ -89,7 +89,7 @@ MailingModuleDescEmailsFromFile=E-mails van een tekstbestand (e-mail;achternaam; MailingModuleDescContactsCategories=Contacten van alle derde partijen (Door categorie) MailingModuleDescDolibarrContractsLinesExpired=Derde partijen met verlopen contractregels MailingModuleDescContactsByCompanyCategory=Contacten van derden (door derden categorie) -# MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescContactsByCategory=Voeg een contact toe per Categorieën MailingModuleDescMembersCategories=Stichting leden (per categorie) MailingModuleDescContactsByFunction=Contacten van derden (door de positie / functie) diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 38b1275b060..e40d5ff4692 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=Nastavitve slovarja # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=Onemogoči JavaScript in Ajax funkcije ConfirmAjax=Za potrditev uporabi Ajax pojavni meni -UseSearchToSelectCompany=Za izbiro podjetja uporabi obrazec za iskanje(namesto polja s seznamom).

Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante SOCIETE_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza. +UseSearchToSelectCompany=Za izbiro podjetja uporabi obrazec za iskanje(namesto polja s seznamom).

Če je partnerjev zelo veliko (> 100 000), lahko hitrost povišate z nastavitvijo konstante COMPANY_DONOTSEARCH_ANYWHERE na 1 v Nastavitve->Ostale nastavitve. Iskanje bo s tem omejeno na začetek niza. ActivityStateToSelectCompany= Dodaj opcijo filtra za prikaz/skritje partnerjev, ki so trenutno neaktivni ali so prekinili aktivnosti # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=Opcije iskalnega filtra diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 1a3ad14dd02..f7c90228a3c 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tip için ErrorCodeCantContainZero=Kod 0 değeri içeremez DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle ConfirmAjax=Açılır Ajax onay pencereleri kullanın -UseSearchToSelectCompany=Üçüncü partileri seçmek için (liste kutusu yerine) oto tamamlamalı alanları kullanın.

Çok sayıda üçüncü parti (>100 000) olsa da Ayarlar->Diğer (Setup->Other) de SOCIETE_DONOTSEARCH_ANYWHERE değişmezini 1 yaparak hızı arttırabilirsiniz. Bundan sonra arama yalnızca dizenin başlangıcı ile sınırlıdır. +UseSearchToSelectCompany=Üçüncü partileri seçmek için (liste kutusu yerine) oto tamamlamalı alanları kullanın.

Çok sayıda üçüncü parti (>100 000) olsa da Ayarlar->Diğer (Setup->Other) de COMPANY_DONOTSEARCH_ANYWHERE değişmezini 1 yaparak hızı arttırabilirsiniz. Bundan sonra arama yalnızca dizenin başlangıcı ile sınırlıdır. ActivityStateToSelectCompany= Halen etkin olan ya da durdmuş olan üçüncü partilerin görünmesi/gizlenmesi bir süzgeç seçeneği ekleyin UseSearchToSelectContact=Kişi seçmek için (liste kutusu yerine) oto tamamlamalı alanları kullanın.

Çok sayıda üçüncü parti (>100 000) olsa da Ayarlar->Diğer den CONTACT_DONOTSEARCH_ANYWHERE değişmezini 1 yaparak hızı arttırabilirsiniz. Bundan sonra arama yalnızca dizenin başlangıcı ile sınırlı olacaktır. SearchFilter=Arama süzgeçi seçenekleri diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index e41b368d345..77eb58b5558 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -49,7 +49,7 @@ ErrorReservedTypeSystemSystemAuto=Giá trị 'hệ thống' và 'hệ thống t ErrorCodeCantContainZero=Mã lệnh không thể chứa giá trị 0 DisableJavascript=Vô hiệu hóa JavaScript và tính năng Ajax ConfirmAjax=Sử dụng popups xác định từ Ajax -UseSearchToSelectCompany=Sử dụng các trường tự động bổ sung để chọn các liên kết với các nhà phát triển thứ ba (thay vì danh sách chọn).

Đồng thời nếu bạn có một số lượng lớn các nhà phát triển thứ ba (>100 000), bạn có thể tăng tốc độ bằng việc thiết lập hằng số SOCIETE_DONOTSEARCH_ANYWHERE thành 1 trong Thiết lập->Khác. Việc tìm kiếm sẽ được giới hạn với những chuỗi bắt đầu. +UseSearchToSelectCompany=Sử dụng các trường tự động bổ sung để chọn các liên kết với các nhà phát triển thứ ba (thay vì danh sách chọn).

Đồng thời nếu bạn có một số lượng lớn các nhà phát triển thứ ba (>100 000), bạn có thể tăng tốc độ bằng việc thiết lập hằng số COMPANY_DONOTSEARCH_ANYWHERE thành 1 trong Thiết lập->Khác. Việc tìm kiếm sẽ được giới hạn với những chuỗi bắt đầu. ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các nhà phát triển thứ ba hiện đang hoạt động hoặc đã bị xóa UseSearchToSelectContact=Sử dụng trường tự hoàn tất để chọn liên lạc (thay vì sử dụng danh sách chọn).

Đồng thời nếu bạn có nhiều các phần tiện ích từ bên thứ ba (> 100 000), bạn có thể tắng tốc độ bằng cách thiết lập hằng số CONTACT_DONOTSEARCH_ANYWHERE lên 1 trong Cài đặt->Khác. Tìm kiếm sau đó sẽ giới hạn phần bắt đầu của chuỗi. SearchFilter=Tùy chọn bộ lọc tìm kiếm diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index da251bbfa8d..3f6a2687cc2 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -49,9 +49,9 @@ ErrorReservedTypeSystemSystemAuto=类型值 'system' 与 'systemauto' 是系统 ErrorCodeCantContainZero=编码不能包含 0 DisableJavascript=禁用 JavaScript 和 Ajax 功能 ConfirmAjax=使用 Ajax 弹出式确认窗口 -UseSearchToSelectCompany=使用自动完成栏的方式，来选择第三方(不使用下拉选择框)

如果你有大于 100000 笔第三方资讯，则可以通过修改SOCIETE_DONOTSEARCH_ANYWHERE 常数为 1 来加快速度。此常数可以在设定->其他设置中设定。这样自动完成功能会被限制为从字首开始依次匹配。 +UseSearchToSelectCompany=使用自动完成栏的方式，来选择第三方(不使用下拉选择框)

如果你有大于 100000 笔第三方资讯，则可以通过修改COMPANY_DONOTSEARCH_ANYWHERE 常数为 1 来加快速度。此常数可以在设定->其他设置中设定。这样自动完成功能会被限制为从字首开始依次匹配。 ActivityStateToSelectCompany= 添加一个筛选器选项来显示/隐藏当前有往来或已停止往来的客户/供应商。 -UseSearchToSelectContact=使用自动完成栏的方式，来选择第三方(取代下拉菜单)

如果你有大于 100000 个第三方，则可以通过修改SOCIETE_DONOTSEARCH_ANYWHERE 常数为 1 来加快速度。此常数可以在设定->其他设置中设定。这样自动完成功能会被限制为从字首开始依次匹配。 +UseSearchToSelectContact=使用自动完成栏的方式，来选择第三方(取代下拉菜单)

如果你有大于 100000 个第三方，则可以通过修改COMPANY_DONOTSEARCH_ANYWHERE 常数为 1 来加快速度。此常数可以在设定->其他设置中设定。这样自动完成功能会被限制为从字首开始依次匹配。 SearchFilter=搜索过滤选项 NumberOfKeyToSearch=触发搜索的字符数量：%s ViewFullDateActions=在第三表中显示全天事件 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 52a1bf25b0a..a311430d632 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -49,7 +49,7 @@ DictionnarySetup=設定選項清單 # ErrorCodeCantContainZero=Code can't contain value 0 DisableJavascript=禁用JavaScript和Ajax功能 ConfirmAjax=使用Ajax確認彈出式窗口 -UseSearchToSelectCompany=使用自動完成欄位資訊的方式，來選擇客戶/供應商(而不是使用清單方式)

如果你有大於100000筆的客戶/供應商資訊，則可以藉由修改SOCIETE_DONOTSEARCH_ANYWHERE常數為 1 來加快速度。此常數可以在設定->其他設置中設定。 這樣在搜尋的時候會被限制為字串開始輸入時。 +UseSearchToSelectCompany=使用自動完成欄位資訊的方式，來選擇客戶/供應商(而不是使用清單方式)

如果你有大於100000筆的客戶/供應商資訊，則可以藉由修改COMPANY_DONOTSEARCH_ANYWHERE常數為 1 來加快速度。此常數可以在設定->其他設置中設定。 這樣在搜尋的時候會被限制為字串開始輸入時。 ActivityStateToSelectCompany= 添加一個篩選器的選項，以顯示/隱藏thirdparties，這是在目前的活動或已停止 # UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).

Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. SearchFilter=搜尋過濾選項 diff --git a/htdocs/societe/ajaxcompanies.php b/htdocs/societe/ajaxcompanies.php index 981a9c7d40f..32fbe2e2c00 100644 --- a/htdocs/societe/ajaxcompanies.php +++ b/htdocs/societe/ajaxcompanies.php @@ -66,7 +66,7 @@ if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn')) { $sql.=" AND ("; // Add criteria on name/code - if (! empty($conf->global->SOCIETE_DONOTSEARCH_ANYWHERE)) // Can use index + if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) // Can use index { $sql.="nom LIKE '" . $db->escape($socid) . "%'"; $sql.=" OR code_client LIKE '" . $db->escape($socid) . "%'"; diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index 4e970dffc17..b099da89afe 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -168,7 +168,7 @@ if ($_GET["socid"]) $sql .= " WHERE sc.fk_soc =".$soc->id; $sql .= " AND sc.fk_user = u.rowid"; $sql .= " ORDER BY u.lastname ASC "; - + dol_syslog('societe/commerciaux.php::list salesman sql = '.$sql,LOG_DEBUG); $resql = $db->query($sql); if ($resql) { @@ -227,6 +227,7 @@ if ($_GET["socid"]) $sql = "SELECT u.rowid, u.lastname, u.firstname, u.login"; $sql.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql.= " WHERE u.entity IN (0,".$conf->entity.")"; + if (! empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND u.statut<>0 "; $sql.= " ORDER BY u.lastname ASC "; $resql = $db->query($sql); diff --git a/htdocs/webservices/server_contact.php b/htdocs/webservices/server_contact.php index cfe25afbe4c..a4538772e1a 100644 --- a/htdocs/webservices/server_contact.php +++ b/htdocs/webservices/server_contact.php @@ -112,7 +112,8 @@ $contact_fields = array( 'ref_propal' => array('name'=>'ref_propal','type'=>'xsd:string'), 'user_id' => array('name'=>'user_id','type'=>'xsd:string'), 'user_login' => array('name'=>'user_login','type'=>'xsd:string'), - 'civility_id' => array('name'=>'civility_id','type'=>'xsd:string') + 'civility_id' => array('name'=>'civility_id','type'=>'xsd:string'), + 'poste' => array('name'=>'poste','type'=>'xsd:string') //... ); //Retreive all extrafield for contact @@ -300,7 +301,8 @@ function getContact($authentication,$id,$ref='',$ref_ext='') 'ref_propal' => $contact->ref_propal, 'user_id' => $contact->user_id, 'user_login' => $contact->user_login, - 'civilite_id' => $contact->civility_id + 'civilite_id' => $contact->civility_id, + 'poste' => $contact->poste ); //Retreive all extrafield for thirdsparty @@ -409,6 +411,7 @@ function createContact($authentication,$contact) $newobject->ref_propal=$contact['ref_propal']; $newobject->user_id=$contact['user_id']; $newobject->user_login=$contact['user_login']; + $newobject->poste=$contact['poste']; //Retreive all extrafield for thirdsparty // fetch optionals attributes and labels @@ -654,6 +657,7 @@ function updateContact($authentication,$contact) $object->email=$contact['email']; $object->civilite_id=$contact['civility_id']; + $object->poste=$contact['poste']; //Retreive all extrafield for contact