lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.4' into develop

Browse Source 
Conflicts:
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/it_IT/admin.lang
	htdocs/langs/nb_NO/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/pt_BR/admin.lang
	htdocs/langs/pt_PT/admin.lang
	htdocs/langs/sl_SI/admin.lang
	htdocs/langs/zh_TW/admin.lang
This commit is contained in:
Laurent Destailleur 2013-06-28 00:52:09 +02:00
commit 314d45a9ee
17 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/adherents/class/adherent.class.php
View File

@ -1539,11 +1539,12 @@ class Adherent extends CommonObject
*/
function getCivilityLabel()
{
global $langs;
$langs->load("dict");
$code=$this->civilite_id;
return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
global $langs;
$langs->load("dict");
$code=(! empty($this->civilite_id)?$this->civilite_id:(! empty($this->civility_id)?$this->civility_id:''));
if (empty($code)) return '';
return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code);
}
/**

1
htdocs/core/modules/mailings/modules_mailings.php
View File

@ -170,6 +170,7 @@ class MailingTargets // This can't be abstract as it is used for some method
$sql .= "'".$this->db->escape($targetarray['other'])."',";
$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
$sql .= "'".$this->db->escape($targetarray['source_id'])."',";
$sql .= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) {
$sql .= "'".$this->db->escape(md5($targetarray['email'].';'.$targetarray['name'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
}

2
htdocs/core/modules/modSociete.class.php
View File

@ -263,7 +263,7 @@ class modSociete extends DolibarrModules
$this->export_TypeFields_array[$r]=array('s.nom'=>"Text",'s.status'=>"Number",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",'s.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.code_compta'=>"Text",'s.code_compta_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'p.libelle'=>"List:c_pays:libelle:rowid",'p.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.siret'=>"Text",'s.siren'=>"Text",'s.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Number",'s.note_private'=>"Text",'s.note_public'=>"Text",'t.libelle'=>"Text",'ce.code'=>"List:c_effectif:libelle:code","cfj.libelle"=>"Text",'s.fk_prospectlevel'=>'List:c_prospectlevel:label:code','s.fk_stcomm'=>'List:c_stcomm:libelle:code','d.nom'=>'Text');
$this->export_entities_array[$r]=array(); // We define here only fields that use another picto
// Add extra fields
$sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'company'";
$sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe'";
$resql=$this->db->query($sql);
if ($resql) // This can fail when class is used on old database (during migration for example)
{

2
htdocs/langs/ca_ES/admin.lang
View File

@ -291,7 +291,7 @@ GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canv
GenericMaskCodes4a=<u>Exemple a la 99ª %s del tercer L'Empresa realitzada el 31/03/2007: </u> <br>
GenericMaskCodes4b=<u>Exemple sobre un tercer creat el 31/03/2007: </u> <br>
GenericMaskCodes4c=<u>Exemple en un producte/servei creat el 31/03/2007:</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donarà <b>ABC0703-000099</b><br><b>{0000+100}-XXX/{dd}/YYY</b> donarà <b>0199-XXX/31/YYY</b>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donarà <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX/{dd}/YYY</b> donarà <b>0199-XXX/31/YYY</b>
GenericNumRefModelDesc=Retorna un nombre creat d'acord amb una màscara definida.
ServerAvailableOnIPOrPort=Servidor disponible a l'adreça <b>%s</b> al port <b>%s</b>
ServerNotAvailableOnIPOrPort=Servidor no disponible en l'adreça <b>%s</b> al port <b>%s</b>

10
htdocs/langs/el_GR/admin.lang
View File

@ -285,16 +285,6 @@ DownloadPackageFromWebSite=Μεταφόρτωση πακέτου.
# CurrentVersion=Dolibarr current version
# CallUpdatePage=Go to the page that updates the database structure and datas: %s.
LastStableVersion=Τελευταία σταθερή έκδοση
GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
GenericMaskCodes2=<b>{cccc}</b> the client code<br><b>{cccc000}</b> the client code on n characters is followed by a client's ref counter without offset and zeroized with the global counter.<br><b>{tttt}</b> The code of company type on n characters (see dictionnary-company types).<br>
GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
# GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
GenericNumRefModelDesc=Return a customizable number according to a defined mask.
ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
DoTestServerAvailability=Έλεγχος διασύνδεσης server
DoTestSend=Δοκιμή Αποστολής
# DoTestSendHTML=Test sending HTML

2
htdocs/langs/en_US/admin.lang
View File

@ -290,7 +290,7 @@ GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces
GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>

2
htdocs/langs/es_ES/admin.lang
View File

@ -291,7 +291,7 @@ GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambio
GenericMaskCodes4a=<u>Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007: </u><br>
GenericMaskCodes4b=<u>Ejemplo sobre un tercero creado el 31/03/2007:</u><br>
GenericMaskCodes4c=<u>Ejemplo en un producto/servicio creado el 31/03/2007:</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0703-000099</b><br><b>{0000+100}-XXX/{dd}/YYY</b> daráa <b>0199-XXX/31/YYY</b>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX/{dd}/YYY</b> daráa <b>0199-XXX/31/YYY</b>
GenericNumRefModelDesc=Devuelve un número creado acorde a una máscara definida.
ServerAvailableOnIPOrPort=Servidor disponible en la dirección <b>%s</b> en el puerto <b>%s</b>
ServerNotAvailableOnIPOrPort=Servidor no disponible en la dirección <b>%s</b> en el puerto <b>%s</b>

2
htdocs/langs/fr_FR/admin.lang
View File

@ -291,7 +291,7 @@ GenericMaskCodes3=Tout autre caractère dans le masque sera laissé inchangé.<b
GenericMaskCodes4a=<u>Exemple sur la 99eme %s du tiers LaCompanie faite le 31/03/2007 :</u><br>
GenericMaskCodes4b=<u>Exemple sur un tiers créé le 31/03/2007 :</u><br>
GenericMaskCodes4c=<u>Exemple sur un produit/service créé le 31/03/2007 :</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100}-XXX-{dd}-YYY</b> donnera <b>0199-XXX-31-YYY</b>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX-{dd}-YYY</b> donnera <b>0199-XXX-31-YYY</b>
GenericNumRefModelDesc=Renvoie un numéro personnalisable selon un masque à définir.
ServerAvailableOnIPOrPort=Serveur disponible à l'adresse <b>%s</b> sur le port <b>%s</b>
ServerNotAvailableOnIPOrPort=Serveur non disponible à l'adresse <b>%s</b> sur le port <b>%s</b>

2
htdocs/langs/fr_FR/main.lang
View File

@ -566,7 +566,7 @@ TotalWoman=Totale
TotalMan=Total
NeverReceived=Jamais reçu
Canceled=Annulé
YouCanChangeValuesForThisListFromDictionnarySetup=Vous pouvez changer ces valeurs depuis le menu accueil - configuration - dictionnaires
YouCanChangeValuesForThisListFromDictionnarySetup=Vous pouvez changer les valeurs de cette liste depuis le menu accueil - configuration - dictionnaires
Color=Couleur
Documents=Fichiers joints
DocumentsNb=Fichiers joints (%s)

2
htdocs/langs/it_IT/admin.lang
View File

@ -291,7 +291,7 @@ GenericMaskCodes3=Tutti gli altri caratteri nello schema rimarranno inalterati.
GenericMaskCodes4a=<u>Esempio sulla novantanovesima %s del terzo TheCompany fatta il 31/01/2007:</u> <br>
GenericMaskCodes4b=<u>Esempio : il 99esimo cliente/fornitore viene creato 31/01/2007:</u> <br>
# GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=<b> ABC{yy}{mm}-{000000} </b> darà <b> ABC0701-000099 </b> <br> <b> {0000+100}-ZZZ/{dd}/XXX </b> darà <b> 0199-ZZZ/31/XXX </b>
GenericMaskCodes5=<b> ABC{yy}{mm}-{000000} </b> darà <b> ABC0701-000099 </b> <br> <b> {0000+100@1}-ZZZ/{dd}/XXX </b> darà <b> 0199-ZZZ/31/XXX </b>
GenericNumRefModelDesc=Restituisce un numero personalizzabile in base allo schema definito dalla maschera.
ServerAvailableOnIPOrPort=Il server è disponibile all'indirizzo <b> %s </b> sulla porta <b> %s </b>
ServerNotAvailableOnIPOrPort=Il server non è disponibile all'indirizzo <b> %s </b> sulla porta <b> %s </b>

1
htdocs/langs/nb_NO/admin.lang
View File

@ -291,7 +291,6 @@ GenericMaskCodes3=Alle andre tegn i masken vil være intakt. <br> Mellomrom er i
GenericMaskCodes4a=<u>Eksempel på 99nde %s av tredje part TheCompany gjort 2007-01-31:</u> <br>
GenericMaskCodes4b=<u>Eksempel på tredjeparts opprettet på 2007-03-01:</u> <br>
# GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=<b>ABC (åå) (mm) - (000000)</b> vil gi <b>ABC0701-000099</b> <br> <b>(0000)-ZZZ 100 / dd () / XXX</b> vil gi <b>0199-ZZZ/31/XXX</b>
GenericNumRefModelDesc=Gir et egendefinert nummer etter en definert mal.
ServerAvailableOnIPOrPort=Serveren er tilgjengelig på adressen <b>%s</b> på port <b>%s</b>
ServerNotAvailableOnIPOrPort=Serveren er ikke tilgjengelig på adressen <b>%s</b> på port <b>%s</b>

2
htdocs/langs/nl_NL/admin.lang
View File

@ -291,7 +291,7 @@ GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>
GenericMaskCodes4a=<u>Voorbeeld van de 99e %s van de Klant 'HetBedrijf' gedaan op 2007-01-31:</u><br>
GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
# GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=<b>ABC{jj}{mm}-{000000}</b> zal <b>ABC0701-000099</b> geven<br><b>{0000+100}-ZZZ/{dd}/XXX</b> zal <b>0199-ZZZ/31/XXX</b> geven
GenericMaskCodes5=<b>ABC{jj}{mm}-{000000}</b> zal <b>ABC0701-000099</b> geven<br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> zal <b>0199-ZZZ/31/XXX</b> geven
GenericNumRefModelDesc=Geeft een aanpasbaar nummer volgens een gedefinieerd masker.
ServerAvailableOnIPOrPort=Server is beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>
ServerNotAvailableOnIPOrPort=Server is niet beschikbaar op het IP-adres <b>%s</b> met poort <b>%s</b>

1
htdocs/langs/pt_BR/admin.lang
View File

@ -380,7 +380,6 @@ LinkToTest=Link clicável gerado por usuário <strong>%s</strong> (clique no nú
KeepEmptyToUseDefault=Mantenha vazio para usar o valor default
DefaultLink=link padrão
ValueOverwrittenByUserSetup=Atenção, este valor pode ser substituído por configuração específica do usuário (cada usuário pode definir sua própria url clicktodial)
# Modules
Module0Name=Usuários e Grupos
Module0Desc=Usuários e gestão de grupos

2
htdocs/langs/pt_PT/admin.lang
View File

@ -291,7 +291,7 @@ GenericMaskCodes3=Qualquer outro caractere na máscara fica sem alterações. <
GenericMaskCodes4a=<u>Exemplo em 99 ª %s o Terceiro a Empresa realizada em 31/03/2007: </u><br>
GenericMaskCodes4b=<u>Exemplo sobre um Terceiro criado em 31/03/2007:</u><br>
# GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0703-000099</b><br><b>{0000+100}-XXX/{dd}/YYY</b> dará <b>0199-XXX/31/YYY</b>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dará <b>ABC0703-000099</b><br><b>{0000+100@1}-XXX/{dd}/YYY</b> dará <b>0199-XXX/31/YYY</b>
GenericNumRefModelDesc=Devolve um número criado na linha numa máscara definida.
ServerAvailableOnIPOrPort=Servidor disponivel no endereço <b>%s</b> na porta <b>%s</b>
ServerNotAvailableOnIPOrPort=Servidor não disponivel no endereço <b>%s</b> na Porta <b>%s</b>

2
htdocs/langs/sl_SI/admin.lang
View File

@ -291,7 +291,7 @@ GenericMaskCodes3=Vsi ostali znaki v maski bodo ostali nedotaknjeni.<br>Presledk
GenericMaskCodes4a=<u>Primer 99-ega %s partnerja podjetja narejen 2007-01-31:</u><br>
GenericMaskCodes4b=<u>Primer partnerja 99, kreiranega 2007-03-01:</u><br>
# GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> bo dal rezultat <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> bo dal rezultat <b>0199-ZZZ/31/XXX</b>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> bo dal rezultat <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> bo dal rezultat <b>0199-ZZZ/31/XXX</b>
GenericNumRefModelDesc=Predlaga prilagodljivo številko glede na definirano masko.
ServerAvailableOnIPOrPort=Strežnik je na voljo na naslovu <b>%s</b> na vratih <b>%s</b>
ServerNotAvailableOnIPOrPort=Strežnik ni na voljo na naslovu <b>%s</b> na vratih <b>%s</b>

2
htdocs/langs/tr_TR/admin.lang
View File

@ -290,7 +290,7 @@ GenericMaskCodes3=Maskede diğer tüm karakterler olduğu gibi kalır.<br>Boşlu
GenericMaskCodes4a=<u>Üçüncü partinin 99 uncu %s örneği Firma 2007/01/31 de yapıldı:</u><br>
GenericMaskCodes4b=<u>2007/03/01 tarihinde oluşturulan üçüncü parti örneği:</u><br>
GenericMaskCodes4c=<u>2007-03-01 de oluşturulan ürün için örnek:</u><br>
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> <b>ABC0701-000099</b> verecektir <br><b>{0000+100}-ZZZ/{dd}/XXX</b> <b>0199-ZZZ/31/XXX</b> verecektir
GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> <b>ABC0701-000099</b> verecektir <br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> <b>0199-ZZZ/31/XXX</b> verecektir
GenericNumRefModelDesc=Tanımlı bir maskeye göre özelleştirilebilir bir sayı verir.
ServerAvailableOnIPOrPort=Sunucu <b>%s</b> portundaki <b>%s</b> adresinde bulunur.
ServerNotAvailableOnIPOrPort=Sunucu <b>%s</b> portundaki <b>%s</b> adresinde yoktur.

2
htdocs/langs/zh_TW/admin.lang
View File

@ -291,7 +291,7 @@ GenericMaskCodes3=非遮罩字元的則該字元維持不變，也就是 A 就
GenericMaskCodes4a=<u>例如: 第99筆 %s 資訊於 2007-01-31 建立完成：</u> <br>
GenericMaskCodes4b=<u>例如: 於 2007-01-31 建立的客戶/供應商資訊:</u> <br>
# GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
GenericMaskCodes5=參數:<b>ABC{yy}{mm}-{000000}</b> 編碼為 <b>ABC0701-000099</b><br> 參數:<b>{0000+100}-ZZZ/{dd}/XXX</b> 編碼為 <b>0199-ZZZ/31/XXX</b>
GenericMaskCodes5=參數:<b>ABC{yy}{mm}-{000000}</b> 編碼為 <b>ABC0701-000099</b><br> 參數:<b>{0000+100@1}-ZZZ/{dd}/XXX</b> 編碼為 <b>0199-ZZZ/31/XXX</b>
GenericNumRefModelDesc=根據事先定義的遮罩值，回傳一個客制化的編號，詳細可參照說明。
ServerAvailableOnIPOrPort=服務器可在地址<b>%s%s的</b>連接埠上
ServerNotAvailableOnIPOrPort=服務器而不是<b>％</b>可在地址<b>的</b>港口<b>%s</b>對