diff --git a/htdocs/includes/modules/commande/mod_commande_marbre.php b/htdocs/includes/modules/commande/mod_commande_marbre.php index 9edc1505dc3a107cbcca5dff35e31f3c3d74c780..24997b09da1999833adaf3551d09ef538d6c9cbf 100644 --- a/htdocs/includes/modules/commande/mod_commande_marbre.php +++ b/htdocs/includes/modules/commande/mod_commande_marbre.php @@ -39,14 +39,14 @@ class mod_commande_marbre extends ModeleNumRefCommandes var $nom='Marbre'; - /** \brief Renvoi la description du modele de numerotation - * \return string Texte descripif - */ - function info() - { - global $langs; - return $langs->trans("MarbreNumRefDesc",$this->prefix); - } + /** \brief Return description of numbering module + * \return string Text with description + */ + function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc",$this->prefix); + } /** \brief Renvoi un exemple de numerotation @@ -64,12 +64,12 @@ class mod_commande_marbre extends ModeleNumRefCommandes */ function canBeActivated() { - global $conf; + global $conf,$langs; - $coyymm=''; + $coyymm=''; $max=''; $posindice=8; - $sql = "SELECT MAX(ref) as max"; + $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; $sql.= " FROM ".MAIN_DB_PREFIX."commande"; $sql.= " WHERE ref LIKE '".$this->prefix."____-%'"; $sql.= " AND entity = ".$conf->entity; @@ -78,12 +78,12 @@ class mod_commande_marbre extends ModeleNumRefCommandes if ($resql) { $row = $db->fetch_row($resql); - if ($row) $coyymm = substr($row[0],0,6); + if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; } } if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm)) { $langs->load("errors"); - $this->error=$langs->trans('ErrorNumRefModel'); + $this->error=$langs->trans('ErrorNumRefModel', $max); return false; } diff --git a/htdocs/includes/modules/facture/mod_facture_terre.php b/htdocs/includes/modules/facture/mod_facture_terre.php index b9bf75bee60bb344d5f1fd0b9f9c46ae73324006..c8ec9bf53c97875548da73206d3c239be165bb9e 100644 --- a/htdocs/includes/modules/facture/mod_facture_terre.php +++ b/htdocs/includes/modules/facture/mod_facture_terre.php @@ -42,9 +42,7 @@ class mod_facture_terre extends ModeleNumRefFactures function info() { global $langs; - $langs->load("bills"); - return $langs->trans('TerreNumRefModelDesc1',$this->prefixinvoice,$this->prefixcreditnote); } @@ -67,9 +65,10 @@ class mod_facture_terre extends ModeleNumRefFactures $langs->load("bills"); // Check invoice num - $fayymm=''; + $fayymm=''; $max=''; - $sql = "SELECT MAX(facnumber) as max"; + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(facnumber FROM ".$posindice.")) as max"; // This is standard SQL $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$this->prefixinvoice."____-%'"; $sql.= " AND entity = ".$conf->entity; @@ -78,19 +77,20 @@ class mod_facture_terre extends ModeleNumRefFactures if ($resql) { $row = $db->fetch_row($resql); - if ($row) $fayymm = substr($row[0],0,6); + if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; } } if ($fayymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$fayymm)) { $langs->load("errors"); - $this->error=$langs->trans('ErrorNumRefModel'); + $this->error=$langs->trans('ErrorNumRefModel',$max); return false; } // Check credit note num $fayymm=''; - $sql = "SELECT MAX(facnumber)"; + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(facnumber FROM ".$posindice.")) as max"; // This is standard SQL $sql.= " FROM ".MAIN_DB_PREFIX."facture"; $sql.= " WHERE facnumber LIKE '".$this->prefixcreditnote."____-%'"; $sql.= " AND entity = ".$conf->entity; @@ -99,11 +99,11 @@ class mod_facture_terre extends ModeleNumRefFactures if ($resql) { $row = $db->fetch_row($resql); - if ($row) $fayymm = substr($row[0],0,6); + if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; } } if ($fayymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$fayymm)) { - $this->error=$langs->trans('TerreNumRefModelError'); + $this->error=$langs->trans('ErrorNumRefModel',$max); return false; } diff --git a/htdocs/includes/modules/fichinter/mod_pacific.php b/htdocs/includes/modules/fichinter/mod_pacific.php index 90bbd34eed1bd4af68c92c7ae2e7237a2a0e2972..ae9d53524367dd6b2684e221ef2bf6e41a85583e 100644 --- a/htdocs/includes/modules/fichinter/mod_pacific.php +++ b/htdocs/includes/modules/fichinter/mod_pacific.php @@ -35,27 +35,17 @@ class mod_pacific extends ModeleNumRefFicheinter { var $prefix='FI'; var $error=''; + var $nom = 'pacific'; - /** \brief Constructeur - */ - function mod_pacific() - { - $this->nom = "pacific"; - } - - - /** \brief Renvoi la description du modele de numerotation - * \return string Texte descripif - */ - function info() - { - global $langs; - - $langs->load("bills"); - - return $langs->trans('PacificNumRefModelDesc1',$this->prefix); - } + /** \brief Return description of numbering module + * \return string Text with description + */ + function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc",$this->prefix); + } /** \brief Renvoi un exemple de numerotation * \return string Example @@ -75,9 +65,10 @@ class mod_pacific extends ModeleNumRefFicheinter $langs->load("bills"); - $fayymm=''; + $fayymm=''; $max=''; - $sql = "SELECT MAX(ref)"; + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; $sql.= " FROM ".MAIN_DB_PREFIX."fichinter"; $sql.= " WHERE ref like '".$this->prefix."____-%'"; $sql.= " WHERE entity = ".$conf->entity; @@ -86,7 +77,7 @@ class mod_pacific extends ModeleNumRefFicheinter if ($resql) { $row = $db->fetch_row($resql); - if ($row) $fayymm = substr($row[0],0,6); + if ($row) { $fayymm = substr($row[0],0,6); $max=$row[0]; } } if (! $fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$fayymm)) { @@ -95,7 +86,7 @@ class mod_pacific extends ModeleNumRefFicheinter else { $langs->load("errors"); - $this->error=$langs->trans('ErrorNumRefModel'); + $this->error=$langs->trans('ErrorNumRefModel',$max); return false; } } @@ -109,7 +100,7 @@ class mod_pacific extends ModeleNumRefFicheinter { global $db,$conf; - // D'abord on recupere la valeur max (reponse immediate car champ indexe) + // D'abord on recupere la valeur max $posindice=8; $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; $sql.= " FROM ".MAIN_DB_PREFIX."fichinter"; diff --git a/htdocs/includes/modules/project/mod_project_simple.php b/htdocs/includes/modules/project/mod_project_simple.php index 72b40cd97762fff19334fd03b8ed10dfa7ff4232..a5def66241095719d83de49d3b20c94b7b349e9e 100644 --- a/htdocs/includes/modules/project/mod_project_simple.php +++ b/htdocs/includes/modules/project/mod_project_simple.php @@ -1,5 +1,6 @@ <?php -/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> +/* Copyright (C) 2010 Regis Houssin <regis@dolibarr.fr> + * Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net> * * 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 @@ -39,14 +40,13 @@ class mod_project_simple extends ModeleNumRefProjects var $nom = "Simple"; - /** \brief Return description of numbering module * \return string Text with description */ function info() { global $langs; - return $langs->trans("SimpleNumRefModelDesc"); + return $langs->trans("SimpleNumRefModelDesc",$this->prefix); } @@ -65,11 +65,12 @@ class mod_project_simple extends ModeleNumRefProjects */ function canBeActivated() { - global $conf; + global $conf,$langs; - $coyymm=''; + $coyymm=''; $max=''; - $sql = "SELECT MAX(ref) as max"; + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; $sql.= " FROM ".MAIN_DB_PREFIX."projet"; $sql.= " WHERE ref LIKE '".$this->prefix."____-%'"; $sql.= " AND entity = ".$conf->entity; @@ -77,7 +78,7 @@ class mod_project_simple extends ModeleNumRefProjects if ($resql) { $row = $db->fetch_row($resql); - if ($row) $coyymm = substr($row[0],0,6); + if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; } } if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm)) { @@ -86,7 +87,7 @@ class mod_project_simple extends ModeleNumRefProjects else { $langs->load("errors"); - $this->error=$langs->trans('ErrorNumRefModel'); + $this->error=$langs->trans('ErrorNumRefModel',$max); return false; } } @@ -102,7 +103,7 @@ class mod_project_simple extends ModeleNumRefProjects { global $db,$conf; - // D'abord on recupere la valeur max (reponse immediate car champ indexe) + // D'abord on recupere la valeur max $posindice=8; $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; $sql.= " FROM ".MAIN_DB_PREFIX."projet"; diff --git a/htdocs/includes/modules/propale/mod_propale_marbre.php b/htdocs/includes/modules/propale/mod_propale_marbre.php index d9b9e55e419b0d83e2d29a478834d6485951de36..c69a4e7e19cef2859370dd8933acf6de8b82b827 100644 --- a/htdocs/includes/modules/propale/mod_propale_marbre.php +++ b/htdocs/includes/modules/propale/mod_propale_marbre.php @@ -39,14 +39,14 @@ class mod_propale_marbre extends ModeleNumRefPropales var $nom = "Marbre"; - /** \brief Return description of numbering module - * \return string Text with description - */ - function info() - { - global $langs; - return $langs->trans("MarbreNumRefModelDesc"); - } + /** \brief Return description of numbering module + * \return string Text with description + */ + function info() + { + global $langs; + return $langs->trans("SimpleNumRefModelDesc",$this->prefix); + } /** \brief Return an example of numbering module values @@ -64,11 +64,12 @@ class mod_propale_marbre extends ModeleNumRefPropales */ function canBeActivated() { - global $conf; + global $conf,$langs; - $pryymm=''; + $pryymm=''; $max=''; - $sql = "SELECT MAX(ref) as max"; + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; $sql.= " FROM ".MAIN_DB_PREFIX."propal"; $sql.= " WHERE ref LIKE '".$this->prefix."____-%'"; $sql.= " AND entity = ".$conf->entity; @@ -77,7 +78,7 @@ class mod_propale_marbre extends ModeleNumRefPropales if ($resql) { $row = $db->fetch_row($resql); - if ($row) $pryymm = substr($row[0],0,6); + if ($row) { $pryymm = substr($row[0],0,6); $max=$row[0]; } } if (! $pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$pryymm)) @@ -87,7 +88,7 @@ class mod_propale_marbre extends ModeleNumRefPropales else { $langs->load("errors"); - $this->error=$langs->trans('ErrorNumRefModel'); + $this->error=$langs->trans('ErrorNumRefModel',$max); return false; } } diff --git a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php index 32a57b4c921af34270625dd23b42468a4d7e0957..f6af7328b8f4a8e436278d84fb8f421ebad8b913 100644 --- a/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/includes/modules/supplier_order/mod_commande_fournisseur_muguet.php @@ -39,12 +39,13 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders var $prefix='CF'; - /** \brief Renvoi la description du modele de numerotation - * \return string Texte descripif + /** \brief Return description of numbering module + * \return string Text with description */ function info() { - return "Renvoie le numero sous la forme ".$this->prefix."yymm-nnnn ou yy est l'annee, mm le mois et nnnn un compteur sequentiel sans rupture et sans remise a 0"; + global $langs; + return $langs->trans("SimpleNumRefModelDesc",$this->prefix); } @@ -63,11 +64,12 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders */ function canBeActivated() { - global $conf; + global $conf,$langs; - $coyymm=''; + $coyymm=''; $max=''; - $sql = "SELECT MAX(ref) as max"; + $posindice=8; + $sql = "SELECT MAX(SUBSTRING(ref FROM ".$posindice.")) as max"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur"; $sql.= " WHERE ref LIKE '".$this->prefix."____-%'"; $sql.= " AND entity = ".$conf->entity; @@ -75,7 +77,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders if ($resql) { $row = $db->fetch_row($resql); - if ($row) $coyymm = substr($row[0],0,6); + if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; } } if (! $coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm)) { @@ -84,7 +86,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders else { $langs->load("errors"); - $this->error=$langs->trans('ErrorNumRefModel'); + $this->error=$langs->trans('ErrorNumRefModel',$max); return false; } } diff --git a/htdocs/langs/ar_AR/propal.lang b/htdocs/langs/ar_AR/propal.lang index 52c939749ae53000f4e16a1316eb52a8c594bb9b..a892677bddf7830586fdffff7fa8e03002c2c566 100644 --- a/htdocs/langs/ar_AR/propal.lang +++ b/htdocs/langs/ar_AR/propal.lang @@ -92,6 +92,5 @@ ProposalsAndProposalsLines=واقتراح الخطوط التجارية ProposalLine=اقتراح خط DocModelAzurDescription=اقتراح نموذج كامل (logo...) DocModelJauneDescription=اقتراح نموذج اليد الصفراء -MarbreNumRefModelDesc=عودة número مع الشكل nnnn - ٪ syymm الاقتراحات السنة هي السنة فيها ، هو الشهر ملم وnnnn هو كسر التسلسل وليس هناك عودة لل0 // Date 2009-08-11 13:27:01 // STOP - Lines generated via parser diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index a2f8c4bf5e08de4ca88564724923358eda320e19..75316108f21e72ff0e7a50f5aba3394727da1b03 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -764,6 +764,7 @@ RunningUpdateProcessMayBeRequired=Sembla necessari realitzar el procés d'actual YouMustRunCommandFromCommandLineAfterLoginToUser=Ha d'executar la comanda des d'un shell després d'haver iniciat sessió amb el compte <b>%s</b>. YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP DownloadMoreSkins=Més temes per descarregar +SimpleNumRefModelDesc=Retorna el nombre sota el format %syymm-nnnn on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0 ##### Module password generation= undefined== PasswordGenerationStandard=Retorna una contrasenya generada per l'algoritme intern Dolibarr: 8 caràcters, números i caràcters en minúscules barrejades. PasswordGenerationNone=No ofereix contrasenyes. La contrasenya s'introdueix manualment. diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index 7b7c414c60bfece586b9467222ac86d80b49c021..ea6fc610919b01b9499aaf25d1e17095b51e48d4 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -90,5 +90,3 @@ TypeContact_project_task_internal_CONTRIBUTOR=Participant TypeContact_project_task_external_CONTRIBUTOR=Participant # Documents models # DocumentModelBaleine=Model d'informe de projecte complet (logo...) -# NumRef Modules # -SimpleNumRefModelDesc=Retorna el nombre sota el format PJyymm-nnnn on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0 diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang index 65e50888aaf6160047c70c20a13ae921bd067183..cd48534ab4b841af58cd03e49a7a36bb0a2f1104 100644 --- a/htdocs/langs/ca_ES/propal.lang +++ b/htdocs/langs/ca_ES/propal.lang @@ -86,5 +86,3 @@ TypeContact_propal_external_CUSTOMER=Contacte client seguiment pressupost # Documents models DocModelAzurDescription=Model de pressupost complet (logo...) DocModelJauneDescription=Model de pressupost Jaune -# NumRef Modules -MarbreNumRefModelDesc=Retorna el nombre sota el format PRyymm-nnnn on yy és l'any, mm el mes i nnnn un comptador seqüencial sense ruptura i sense tornar a 0 diff --git a/htdocs/langs/da_DA/propal.lang b/htdocs/langs/da_DA/propal.lang index 63e711f557094d5e26e402c70ea3e8f542b4d664..74f2d72f607973f0d67430f230b1400bb7c9a2d9 100644 --- a/htdocs/langs/da_DA/propal.lang +++ b/htdocs/langs/da_DA/propal.lang @@ -100,5 +100,3 @@ LastModifiedProposals=Seneste %s ændrede forslag DatePropal=Dato for forslag ProposalsAndProposalsLines=Kommercielle forslag og linjer ProposalLine=Forslag linje -MarbreNumRefModelDesc=Retur numero med format %syymm-nnnn for forslag, hvor yy er årstal, MM er måneden og nnnn er en sekvens uden pause, og ikke vende tilbage til 0 -// STOP - Lines generated via autotranslator.php tool (2009-08-13 20:39:59). diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang index 245adc7c3cb02a06e0cde0c528e8c48d552429da..e9886a8f9017a4ff67438d6e6a2b23b7ae014169 100644 --- a/htdocs/langs/de_DE/propal.lang +++ b/htdocs/langs/de_DE/propal.lang @@ -98,5 +98,4 @@ LastModifiedProposals=Letzte %s geändert Vorschläge DatePropal=Datum des Vorschlags ProposalsAndProposalsLines=Kommerzielle Vorschlag und Linien ProposalLine=Vorschlag Linie -MarbreNumRefModelDesc=Zurück NUMERO mit Format %syymm-nnnn für Vorschläge, wo ist JJ Jahr, MM Monat und nnnn ist eine Folge ohne Pause und keine Rückkehr auf 0 // STOP - Lines generated via autotranslator.php tool (2009-08-13 20:42:36). diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a66ab75e9365222dfa11019fd9758f668927d3dc..e290d3e466b1c5a4895723a2215a69ca5642e3cf 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -763,6 +763,7 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b>. YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP DownloadMoreSkins=More skins to download +SimpleNumRefModelDesc=Return the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 789dc9945406038aa8af64d40766952e6f168488..0554acf806dd8c50387311b3c8e192888bfebe2f 100755 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -90,5 +90,3 @@ TypeContact_project_task_internal_CONTRIBUTOR=Contributor TypeContact_project_task_external_CONTRIBUTOR=Contributor # Documents models DocumentModelBaleine=A complete project's report model (logo...) -# NumRef Modules -SimpleNumRefModelDesc=Return the reference number with format PJyymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index 3c03c14c4692e99af3beaa4ea406ede62a9b7527..c9e0aeac0958a59862d0cf79a048a5812eae388c 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -86,5 +86,3 @@ TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal # Document models DocModelAzurDescription=A complete proposal model (logo...) DocModelJauneDescription=Jaune proposal model -# NumRef Modules -MarbreNumRefModelDesc=Return numero with format %syymm-nnnn for proposals where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 56f92b8a3833c14ae49ee782380025ed68533eab..7a49afc73afa2dcff089df833e01d4e4046bab74 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -764,6 +764,7 @@ RunningUpdateProcessMayBeRequired=Parece necesario realizar el proceso de actual YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar el comando desde un shell después de haber iniciado sesión con la cuenta <b>%s</b>. YourPHPDoesNotHaveSSLSupport=Funciones SSL no disponibles en su PHP DownloadMoreSkins=Más temas para descargar +SimpleNumRefModelDesc=Devuelve el número bajo el formato %syymm-nnnn donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0 ##### Module password generation= undefined= PasswordGenerationStandard=Devuelve una contraseña generada por el algoritmo interno Dolibarr: 8 caracteres, números y caracteres en minúsculas mezcladas. PasswordGenerationNone=No ofrece contraseñas. La contraseña se introduce manualmente. diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index 3b5358f3cb4e085ed8d926fd5ba811f582a00fd5..e79db9b9c88618d2c9ab5655b21783dbee1db832 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -90,5 +90,3 @@ TypeContact_project_task_internal_CONTRIBUTOR=Participante TypeContact_project_task_external_CONTRIBUTOR=Participante # Documents models # DocumentModelBaleine=Modelo de informe de proyecto completo (logo...) -# NumRef Modules # -SimpleNumRefModelDesc=Devuelve el número bajo el formato PJyymm-nnnn donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0 diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang index c079532202f05305178f64420b1ab109e89c9c20..87452e66812e2d1fcda192ae57cfb38c41136134 100644 --- a/htdocs/langs/es_ES/propal.lang +++ b/htdocs/langs/es_ES/propal.lang @@ -86,5 +86,3 @@ TypeContact_propal_external_CUSTOMER=Contacto cliente seguimiento presupuesto # Documents models DocModelAzurDescription=Modelo de presupuesto completo (logo...) DocModelJauneDescription=Modelo de presupuesto Jaune -# NumRef Modules -MarbreNumRefModelDesc=Devuelve el número bajo el formato PRyymm-nnnn donde yy es el año, mm el mes y nnnn un contador secuencial sin ruptura y sin volver a 0 diff --git a/htdocs/langs/fi_FI/propal.lang b/htdocs/langs/fi_FI/propal.lang index f7e9da3c4eb979d2075016cf699b5409d7885ce0..e41bfe5e3e3c87d2d2bc4597b27035a15573dd7c 100644 --- a/htdocs/langs/fi_FI/propal.lang +++ b/htdocs/langs/fi_FI/propal.lang @@ -98,5 +98,4 @@ LastModifiedProposals=Viimeisin %s muutetut ehdotukset DatePropal=Päiväys Ehdotuksen ProposalsAndProposalsLines=Kaupalliset ehdotusta ja linjat ProposalLine=Ehdotus linja -MarbreNumRefModelDesc=Paluu numero on muodossa %syymm-nnnn ehdotuksia jossa VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0 // STOP - Lines generated via autotranslator.php tool (2009-08-13 20:45:19). diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 035fc1e10e646280ab3ce1a17dcc5ca3ea0c00f9..cf2b78cae93436ff55bbf51d1497cca1b782a853 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -764,6 +764,7 @@ RunningUpdateProcessMayBeRequired=Le lancement du processus de mise à jour semb YouMustRunCommandFromCommandLineAfterLoginToUser=Vous devez exécuter la commande sous un shell après vous être logués avec le compte <b>%s</b>. YourPHPDoesNotHaveSSLSupport=Fonctions SSL non présentes dans votre PHP DownloadMoreSkins=Plus de thèmes à télécharger +SimpleNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0 ##### Module password generation= undefined PasswordGenerationStandard= Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés. diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 6ff8c44a7348b7e6b284452d812b09c3035cad63..f531b1a88e4cd48a74edef286d43bfe8576fa182 100755 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -90,5 +90,3 @@ TypeContact_project_task_internal_CONTRIBUTOR=Intervenant TypeContact_project_task_external_CONTRIBUTOR=Intervenant # Documents models DocumentModelBaleine=Modèle de rapport de projet complet (logo...) -# NumRef Modules -SimpleNumRefModelDesc=Renvoie le numéro sous la forme PJyymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0 diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index b2881ed8fcf2b7c5f545eb365eacec8475f1cbc4..ac2425135e3fe5b8b850a9476541f02c810a38fa 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -86,5 +86,3 @@ TypeContact_propal_external_CUSTOMER=Contact client suivi propale # Documents models DocModelAzurDescription=Modèle de propositions commerciales complet (logo...) DocModelJauneDescription=Modèle de proposition Jaune -# NumRef Modules -MarbreNumRefModelDesc=Renvoie le numéro sous la forme PRyymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0 diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 961a724aadb21bbe67f9957a8be83acd26dfd6bd..6db0ca5a6a9e8eb8d6ab6e55fc8c361b3d9aa8ee 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -606,6 +606,7 @@ MAIN_MAX_DECIMALS_SHOWN =Max decimali per i prezzi indicati sullo scher ParameterActiveForNextInputOnly =Parametro efficace solo per il prossimo inserimento NoEventOrNoAuditSetup =Nessun evento di sicurezza è stato ancora registrato. Questo può essere normale se non è stato attivato sulla pagina "Impostazioni - sicurezza - controllo". NoEventFoundWithCriteria =Nessun evento di sicurezza è stato trovato con i criteri di ricerca impostati. +SimpleNumRefModelDesc =Restituisce un numero di riferimento nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0. ##### Users setup ##### UserGroupSetup =Impostazioni utenti e gruppi diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang index d16cac7f46234bfc577f9bc24aaae4ecd30584ee..dcefba10fc4d4a6dcf7614b4fc123d3ce7fc089d 100644 --- a/htdocs/langs/it_IT/projects.lang +++ b/htdocs/langs/it_IT/projects.lang @@ -26,7 +26,6 @@ DurationEffective =Durata effettiva ListProposalsAssociatedProject =Elenco delle proposte commerciali associate al progetto ListOrdersAssociatedProject =Elenco degli ordini associati al progetto ListInvoicesAssociatedProject =Elenco delle fatture associate al progetto -SimpleNumRefModelDesc =Restituisce un numero di riferimento nel formato PJyymm-nnnn dove yy è l'anno, mm è il mese e nnnn è una sequenza progressiva che non ritorna a 0. DocumentModelBaleine =Modello di rapporto di progetto completo (logo, etc..) // Date 2009-01-18 19:41:54 diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang index 6ad2c528e9f47648218b752c3bce1e917c97a94a..de1b3864b712fb40903b55d6ec5eecb83d6b89ce 100644 --- a/htdocs/langs/it_IT/propal.lang +++ b/htdocs/langs/it_IT/propal.lang @@ -81,7 +81,6 @@ LastModifiedProposals=Ultimo %s proposte modificate DatePropal=Data della proposta ProposalsAndProposalsLines=Proposta commerciale e le linee ProposalLine=Linea della proposta -MarbreNumRefModelDesc=Restituisce un numero con formato %syymm-nnnn in cui yy è l'anno, mm è il mese e nnnn è una sequenza progressiva senza ritorno a 0. TypeContact_propal_internal_SALESREPFOLL=Responsabile proposta vendita TypeContact_propal_external_BILLING=Contatto proposta fatturazione TypeContact_propal_external_CUSTOMER=Contatto proposta clienti diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang index d4b50369482ef937bfc5e668fa83e87855cc4802..ea86cfba436480a6552cd6ddcecbe7abc43298aa 100644 --- a/htdocs/langs/nl_BE/bills.lang +++ b/htdocs/langs/nl_BE/bills.lang @@ -314,15 +314,6 @@ TitanNumRefModelDesc2=The year is incremented by 1 and the increment number is i TitanNumRefModelDesc3=Define the variable SOCIETE_FISCAL_MONTH_START with the month at the start of the fiscal year, example: 9 for September. TitanNumRefModelDesc4=In this example, we shall have on the 1st September 2006 an invoice named FA0700001 -# uranus -UranusNumRefModelDesc1=Renvoie le numéro de facture sous une forme numérique simple, préfixé par l'année sur un seul chiffre - -# venus -VenusNumRefModelDesc1=Renvoie le numéro de facture sous la forme, FA-PREF-030202, où PREF est le préfixe commercial de la société, et est suivi de la date sur un format de 6 digits avec Année, Mois et Jour - -MarbreNumRefModelDesc=Model Marbre - - // START - Lines generated via autotranslator.php tool (2009-08-19 20:37:40). // Reference language: en_US BillsStatisticsSuppliers=Leveranciers facturen statistieken diff --git a/htdocs/langs/nl_BE/propal.lang b/htdocs/langs/nl_BE/propal.lang index 48f91ca6fd7e69e6182bc3ef8b5457d0a2a653b2..67e6eb14994ae27a93337a42351e0e6adf4ce91b 100644 --- a/htdocs/langs/nl_BE/propal.lang +++ b/htdocs/langs/nl_BE/propal.lang @@ -87,5 +87,4 @@ LastModifiedProposals=Last %s gewijzigde voorstellen DatePropal=Datum van het voorstel ProposalsAndProposalsLines=Commerciële voorstel en lijnen ProposalLine=Voorstel lijn -MarbreNumRefModelDesc=Terugkeren numero met format %syymm-nnnn voorstellen waar jj is jaar, mm de maand en nnnn een sequentie zonder pauze en geen terugkeer naar 0 // STOP - Lines generated via autotranslator.php tool (2009-08-19 20:37:40). diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index ede8cb1ebab215ddcff08e175d7a580b4f578440..cc66c55e7134ede8be8b027d55492d5bf6214df3 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -764,6 +764,7 @@ RunningUpdateProcessMayBeRequired=Update lijkt verplicht (Programma versie %s ve YouMustRunCommandFromCommandLineAfterLoginToUser=U dient dit commando vanaf de 'command line' te runnen na in te loggen op de shell met gebruiker <b>%s</b>. YourPHPDoesNotHaveSSLSupport=SSL functies niet beschikbaar in uw PHP DownloadMoreSkins=Meer thema-huiden te downloaden +SimpleNumRefModelDesc=Geeft het aantal als %syymm-nnnn waar yy jaar is, mm de maand en nnnn een sequencer naadloos en zonder vervangde 0 ##### Module password generation PasswordGenerationStandard=Een wachtwoord gegenereerd volgens interne Dolibarr algoritme: 8 karakters met gedeelde nummers en tekens in kleine letters. diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index 429dc16ed0d1c3f906c4d29f52f55abd87468340..07bb3339bf8afe295a61897ba1a25112f79eb89b 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -85,5 +85,3 @@ TypeContact_project_task_internal_CONTRIBUTOR=Medewerker TypeContact_project_task_external_CONTRIBUTOR=Medewerker # Documenten modulen DocumentModelBaleine=Model Project Report Compleet (logo. ..) -# NumRef Modules -SimpleNumRefModelDesc=Geeft het aantal als PJyymm-nnnn waar yy jaar is, mm de maand en nnnn een sequencer naadloos en zonder vervangde 0 diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang index 97050fb1a221946bfe4dc9fab517f8c3c5c3bad8..7097fab82cd3bce1a27520584ca2c9d23fc4e239 100644 --- a/htdocs/langs/nl_NL/propal.lang +++ b/htdocs/langs/nl_NL/propal.lang @@ -88,5 +88,3 @@ TypeContact_propal_external_CUSTOMER=Contact klant tracking voorstel # Document models DocModelAzurDescription=Een complete offerte model (logo. ..) DocModelJauneDescription=Geel offerte model -# NumRef Modules -MarbreNumRefModelDesc=Geeft het aantal als PRyymm-nnnn waar yy jaar is, mm de maand en nnnn een naadloze sequencer zonder vervangings 0 diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang index 9dc41ac7ca0334f45cdce88f2a6e13821e6cdd09..64e9c8597988d4630a64cf730b3027b6f4b6a7a4 100644 --- a/htdocs/langs/pl_PL/propal.lang +++ b/htdocs/langs/pl_PL/propal.lang @@ -100,5 +100,4 @@ LastModifiedProposals=Ostatnia %s zmodyfikowane propozycje DatePropal=Data wniosku ProposalsAndProposalsLines=Commercial wniosku i linie ProposalLine=Wniosek linii -MarbreNumRefModelDesc=Wróć NUMERO z formatu %syymm-nnnn do składania wniosków, jeżeli rr jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0 // STOP - Lines generated via autotranslator.php tool (2009-08-13 21:07:31). diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang index a0b2f5fbb9c64b31a8fb3c49b66cf6ee4ac42a91..20eacd8d26b6c5a9830366ff3837b315d887765c 100644 --- a/htdocs/langs/pt_BR/propal.lang +++ b/htdocs/langs/pt_BR/propal.lang @@ -85,7 +85,4 @@ ProposalLine=Linha da Proposta DocModelAzurDescription=Modelo de orçamento completo (logo...) DocModelJauneDescription=Modelo de Orçamento Jaune -# NumRef Modules -MarbreNumRefModelDesc=Modelo de ref. do Marbre - diff --git a/htdocs/langs/pt_PT/propal.lang b/htdocs/langs/pt_PT/propal.lang index 96567dc377f2ab1417103539ce3fe3fe468040d7..9599d9d92389e1de257ed93c7f9fed497e436e59 100644 --- a/htdocs/langs/pt_PT/propal.lang +++ b/htdocs/langs/pt_PT/propal.lang @@ -87,5 +87,4 @@ LastModifiedProposals=Última %s propostas alteradas DatePropal=Data da proposta ProposalsAndProposalsLines=Proposta comercial e linhas ProposalLine=Proposta linha -MarbreNumRefModelDesc=Retornar numero com formato %syymm-nnnn propostas para onde yy é o ano, mm mês e é nnnn é uma seqüência, sem interrupção e sem volta para 0 // STOP - Lines generated via autotranslator.php tool (2009-08-13 21:10:10). diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang index 839eadea4116594e8f926294a940f926f3f52f3e..1666bd0b0231da7d86c3f5ce067ec972e3f1b517 100644 --- a/htdocs/langs/ro_RO/propal.lang +++ b/htdocs/langs/ro_RO/propal.lang @@ -98,5 +98,4 @@ LastModifiedProposals=Ultima %s propuneri modificate DatePropal=Data de propunerea ProposalsAndProposalsLines=Comerciale propunerea si a liniilor ProposalLine=Propunere linie -MarbreNumRefModelDesc=Întoarceţi-vă NUMERO cu formatul %syymm-NNNN de propuneri în cazul în care este aa ani, mm este luna şi NNNN este o succesiune fără pauză şi fără întoarcere la 0 // STOP - Lines generated via autotranslator.php tool (2009-08-13 21:12:07). diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang index 23646f24378980152fbb83fc92cdf7578ca0d5bd..a3744ddd01da04f06381d3d99aa524001cec3bcc 100644 --- a/htdocs/langs/ru_RU/propal.lang +++ b/htdocs/langs/ru_RU/propal.lang @@ -98,5 +98,4 @@ LastModifiedProposals=Последнее% с измененными предло DatePropal=Дата предложения ProposalsAndProposalsLines=Коммерческое предложение и линий ProposalLine=Предложение линия -MarbreNumRefModelDesc=Вернуться Numero с форматом %syymm-NNNN предложений, где год является годом, мм NNNN месяца и представляет собой последовательность без перерыва и не вернуться до 0 // STOP - Lines generated via autotranslator.php tool (2009-08-13 21:14:36). diff --git a/htdocs/langs/sl_SL/propal.lang b/htdocs/langs/sl_SL/propal.lang index 22d968073714dabd49736476936e602e48a0af96..3edc1d53f308f18fb9bde1dc285ea4513eeda4fa 100644 --- a/htdocs/langs/sl_SL/propal.lang +++ b/htdocs/langs/sl_SL/propal.lang @@ -90,6 +90,3 @@ TypeContact_propal_external_CUSTOMER=Kontakt pri kupcu za sledenje ponudbe DocModelAzurDescription=Vzorec kompletne ponudbe (logo...) DocModelJauneDescription=Vzorec ponudbe Jaune -# NumRef Modules -MarbreNumRefModelDesc=Predlaga številko ponudbe v formatu %syymm-nnnn, kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledka, večja od 0 - diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang index a179f6b5eaf8aab938100f27fdbc58486944498b..41274f91d373edf625dc7aa527dbf4f64c720703 100644 --- a/htdocs/langs/tr_TR/propal.lang +++ b/htdocs/langs/tr_TR/propal.lang @@ -91,5 +91,4 @@ ProposalsAndProposalsLines=Ticari önerisi ve hatları ProposalLine=Önerisi doğrultusunda DocModelAzurDescription=Tam bir öneri modeli (logo. ..) DocModelJauneDescription=Jaune modeli önerisi -MarbreNumRefModelDesc=Format% syymm uyan numero-teklif nnnn nereye YY yılı, mm ay ve nnnn hiçbir break ve 0 olursa dönüş ile bir dizi // STOP - Lines generated via autotranslator.php tool (2010-03-15 19:05:26).