From 1ddf9f6ac55eac39fd789a6868429f54cd065e27 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 24 Nov 2013 19:33:22 +0100 Subject: [PATCH 01/11] Fix: Not coherent filename --- build/makepack-dolibarr.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index f2826cf35b1..4537c68d7e2 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -481,11 +481,12 @@ if ($nboftargetok) { $newbuild =~ s/(dev|alpha)/0.1.a/gi; # dev $newbuild =~ s/beta/0.2.beta1/gi; # beta $newbuild =~ s/rc./0.3.rc1/gi; # rc - if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + if ($newbuild !~ /-/) { $newbuild.='-0.3'; } # finale #$newbuild =~ s/(dev|alpha)/0/gi; # dev #$newbuild =~ s/beta/1/gi; # beta #$newbuild =~ s/rc./2/gi; # rc #if ($newbuild !~ /-/) { $newbuild.='-3'; } # finale + #print "newbuild=".$newbuild."\n";exit; $REL1 = $newbuild; $REL1 =~ s/-.*$//gi; if ($RPMSUBVERSION eq 'auto') { $RPMSUBVERSION = $newbuild; $RPMSUBVERSION =~ s/^.*-//gi; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; From c88bb553bde4c2c3111eec5ae0e0ac728264f4e1 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Thu, 28 Nov 2013 14:25:11 +0100 Subject: [PATCH 02/11] fix wrong example path --- htdocs/langs/ca_ES/admin.lang | 2 +- htdocs/langs/de_AT/admin.lang | 2 +- htdocs/langs/de_DE/admin.lang | 2 +- htdocs/langs/el_GR/admin.lang | 2 +- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/es_ES/admin.lang | 2 +- htdocs/langs/fr_FR/admin.lang | 2 +- htdocs/langs/it_IT/admin.lang | 2 +- htdocs/langs/ko_KR/admin.lang | 2 +- htdocs/langs/nl_NL/admin.lang | 2 +- htdocs/langs/pt_BR/admin.lang | 2 +- htdocs/langs/sl_SI/admin.lang | 2 +- htdocs/langs/tr_TR/admin.lang | 2 +- htdocs/langs/uz_UZ/admin.lang | 2 +- htdocs/langs/vi_VN/admin.lang | 2 +- htdocs/langs/zh_CN/admin.lang | 2 +- htdocs/langs/zh_TW/admin.lang | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 13f3edd6840..09185417b95 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Exemples amb la configuració activa actual ListOfDirectories=Llistat de directoris de plantilles OpenDocument ListOfDirectoriesForModelGenODT=Llistat de directoris amb documents model OpenDocument.

Indiqueu el camí complet del directori.
Afegir un retorn a la línia entre cada directori.Per indicar un directori del mòdul GED, indiqueu DOL_DATA_ROOT/ecm/nomdeldirectori.

Els arxius de plantilla d'aquests directoris han d'acabar amb .odt NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT trobats en aquest(s) directori(s) -ExampleOfDirectoriesForModelGen=Exemples de sintaxi:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Exemples de sintaxi:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT FirstnameNamePosition=Ordre visualització nom/cognoms diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index 4bd29990e0c..1404dda1b06 100644 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -1071,7 +1071,7 @@ ExamplesWithCurrentSetup=Beispiele mit der derzeitigen Systemkonfiguration ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien mit OpenDocument-Format.

Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.
Trennen Sie jedes Verzeichnis mit einer Zeilenschaltung
Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein DOL_DATA_ROOT/ecm/yourdirectoryname.

Dateien in diesen Verzeichnissen müssen auf .odt enden. NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt-Dokumentvorlagen -ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FirstnameNamePosition=Reihenfolge von Vor- und Nachname Module23Name=Energie Module23Desc=Überwachung des Energieverbrauchs diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 5f930167b8c..eecaaf3706d 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Beispiele mit der derzeitigen Systemkonfiguration ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien mit OpenDocument-Format.

Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.
Trennen Sie jedes Verzeichnis mit einer Zeilenschaltung
Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein DOL_DATA_ROOT/ecm/yourdirectoryname.

Dateien in diesen Verzeichnissen müssen auf .odt enden. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=
Lesen Sie die Wiki Dokumentation um zu wissen, wie Sie Ihre odt Dokumentenvorlage erstellen, bevor Sie diese in den Kategorien speichern: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Reihenfolge von Vor- und Nachname diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 87a41062314..2f5113dcced 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Examples with current running setup ListOfDirectories=List of OpenDocument templates directories ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Θέση ονόματος/επιθέτου diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 396bbaf4cb5..34ae0744002 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Examples with current running setup ListOfDirectories=List of OpenDocument templates directories ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index ef4bb836237..e7c22c83375 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Ejemplos con la configuración activa actual ListOfDirectories=Listado de directorios de plantillas OpenDocument ListOfDirectoriesForModelGenODT=Listado de directorios con plantillas de documentos OpenDocument.

Indicar la ruta completa del directorio.
Añadir un retorno a la línea entre cada directorio.Para indicar un directorio del módulo GED, indicar DOL_DATA_ROOT/ecm/nombredeldirectorio.

Los archivos de plantilla de estos directorios deben terminar con .odt NumberOfModelFilesFound=Número de archivos de plantillas ODT encontrados en este/estos directorio(s) -ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=Colocando los siguientes tags en la plantilla, obtendrá una sustitución con el valor personalizado al generar el documento: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT FirstnameNamePosition=Orden visualización nombre/apellidos diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 557c907ed3c..eab7d8414b2 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant ListOfDirectories=Liste des répertoires des modèles OpenDocument ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des documents modèles OpenDocument.

Indiquer les chemins complets de répertoire.
Ajouter un retour à la ligne entre chaque répertoire.
Pour indiquer un répertoire du module GED, indiquer
DOL_DATA_ROOT/ecm/nomdurepertoireged

Les fichiers modèles dans ces répertoires doivent se terminer par .odt. NumberOfModelFilesFound=Nombre de fichiers modèles ODT/ODS trouvés dans ce(s) répertoire(s) -ExampleOfDirectoriesForModelGen=Exemple de syntaxe :
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Exemple de syntaxe :
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=
Pour savoir comment rédiger des modèles de document odt avant de les placer dans un de ces répertoires, consulter la documentation du wiki : FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Créer_un_modèle_de_document_ODT FirstnameNamePosition=Ordre d'affichage prénom/nom diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 8895e682a8d..97767f417e8 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Esempi di funzionamento secondo la configurazione attua ListOfDirectories=Elenco delle directory dei modelli OpenDocument ListOfDirectoriesForModelGenODT=Elenco di directory contenenti i modelli di file per il formato OpenDocument.
Inserisci il percorso completo della directory.

Vai a capo tra una directory e l'altra.

Per aggiungere una directory del modulo GED, aggiungi DOL_DATA_ROOT/ECM/nome directory

I file in queste directory devono avere l'estensione.odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Esempi di sintassi:
c: dir \\
/Home/mydir
DOL_DATA_ROOT/ECM/ecmdir +ExampleOfDirectoriesForModelGen=Esempi di sintassi:
c: dir \\
/Home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=
Per sapere come creare i modelli di documento odt, prima di salvarli in queste directory, leggere la documentazione wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Posizione del cognome/nome diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 570b2490a01..abbd9a29cfa 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -316,7 +316,7 @@ VersionLastUpgrade=최종 버전 업그레이드 # ListOfDirectories=List of OpenDocument templates directories # ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir # FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: # FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template # FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 0ab375acab5..92d38904856 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Voorbeelden met de huidige actieve configuratie ListOfDirectories=Lijst van OpenDocument sjablonenmappen ListOfDirectoriesForModelGenODT=Lijst van mappen met sjablonen in OpenDocument-formaat.

Vul hier het volledige pad naar de mappen in.
Voeg een harde return in tussen elke map.
Om een map van de GED-module toe te voegen, voeg hier dan DOL_DATA_ROOT/ECM/uwmapnaam in.

Bestanden in deze mappen dienen te eindigen op .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Voorbeelden van de syntaxis:
c:\\mijndir
/home/mijndir
DOL_DATA_ROOT/ECM/ecmdir +ExampleOfDirectoriesForModelGen=Voorbeelden van de syntaxis:
c:\\mijndir
/home/mijndir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=Door het plaatsen van de volgende velden in het sjabloon krijgt u een vervanging met de aangepaste waarde bij het genereren van het document: FullListOnOnlineDocumentation=De complete lijst met beschikbare velden is te vinden in de gebruikersdocumentatie op de Wiki van Dolibar: http://wiki.dolibarr.org. FirstnameNamePosition=Positie van voornaam / achternaam diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 874cbbd1168..7e56f778e25 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -316,7 +316,7 @@ SeeWikiForAllTeam=Veja o wiki para mais detalhes de todos os autores e da sua or # ListOfDirectories=List of OpenDocument templates directories # ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir # FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: # FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template # FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index cd95bae1259..4fd8b5871dd 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Primeri pri trenutno veljavnih nastavitvah ListOfDirectories=Seznam map z OpenDocument predlogami ListOfDirectoriesForModelGenODT=Seznam imenikov, ki vsebujejo datoteke predlog v formatu OpenDocument.

Tukaj vstavite celotno pot imenikov.
Dodajte prelom vrstice CR med med vsako mapo.
Če želite dodati mapo GED modula, dodajte tukaj DOL_DATA_ROOT/ecm/imevašemape.

Datoteke v teh mapah morajo imeti končnico .odt # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Primeri sintakse:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Primeri sintakse:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=Z dodatkom takih oznak v predlogo, boste ob kreiranju dokumenta dobili personalizirane vrednosti: FullListOnOnlineDocumentation=http://wiki.dolibarr.org FirstnameNamePosition=Položaj imena/priimka diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 57a8b5b193b..1d0fe2dd860 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Geçerli çalışan ayarlama örnekleri ListOfDirectories=OpenDocument (AçıkBelge) temaları dizin listesi ListOfDirectoriesForModelGenODT=OpenDocument (AçıkBelge) biçimli şablon dosyalarını içeren dizinler listesi.

Buraya tam yol dizinlerini koyun.
Her dizin arasına satır başı ekleyin.
GED modülü dizini eklemek için buraya ekleyinDOL_DATA_ROOT/ecm/yourdirectoryname.

O dizinlerdeki dosyalar.odt ile bitmelidir. NumberOfModelFilesFound=O dizinlerde bulunan ODT/ODS şablon dosyası sayısı -ExampleOfDirectoriesForModelGen=Sözdizimi örnekleri:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=Sözdizimi örnekleri:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=
Odt belge şablonlarının nasıl oluşturulacağını öğrenmek için o dizinlere kaydetmeden önce, wiki belgelerini okuyun: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Ad/Soyad konumu diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index 97ab6ed2301..98ecabf4eaf 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -316,7 +316,7 @@ # ListOfDirectories=List of OpenDocument templates directories # ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir # FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: # FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template # FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index 917806871b2..6d7decb64ea 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -316,7 +316,7 @@ ModuleFamilyBase=Hệ thống # ListOfDirectories=List of OpenDocument templates directories # ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir # FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: # FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template # FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 290c0c5e969..7cc26f109fa 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=当前运行设置的实例 ListOfDirectories=OpenDocument 文档模板目录清单 ListOfDirectoriesForModelGenODT=请输入含有 OpenDocument 格式范本的目录字串。

1. 输入全名称路径。
2. 在每个目录项目之间加入 carriage return 字元。
3. 增加 GED 模块目录，如右：DOL_DATA_ROOT/ecm/yourdirectoryname

4. 在这些目录中的文件副档名必须是.odt。 NumberOfModelFilesFound=这些目录中找到的ODT / ODS模板文件数目 -ExampleOfDirectoriesForModelGen=语法格式：
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=语法格式：
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=
要知道如何建立您的ODT文建范本，并储存在这些目录，请上读上　wiki　网站： FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=姓 /名 位置顺序 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index e72668f06be..2f243b00955 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=與當前正在運行的安裝實例 ListOfDirectories=OpenDocument 的文件範本目錄清單 ListOfDirectoriesForModelGenODT=請輸入含有 OpenDocument 格式範本的目錄字串。

1. 輸入全名稱路徑。
2. 在每個目錄項目之間加入 carriage return 字元。
3. 增加 GED 模組目錄，如右：DOL_DATA_ROOT/ecm/yourdirectoryname
4. 在這些目錄中的檔案副檔名必須是.odt # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=範例：
1. ç:\\mydir
2. /home/mydir
3. DOL_DATA_ROOT/ecm/ecmdir +ExampleOfDirectoriesForModelGen=範例：
1. ç:\\mydir
2. /home/mydir
3. DOL_DATA_ROOT/ecm/Pub/ecmdir FollowingSubstitutionKeysCanBeUsed=
要知道如何建立您的ODT文建範本，並儲存在這些目錄，請上讀上　wiki　網站： FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=的名字位置/名稱 From b9d37fd6f7ab4625d11e866284df79176f0e72a5 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Thu, 28 Nov 2013 14:28:03 +0100 Subject: [PATCH 03/11] [ bug #1159 ] Commercial search "other" give p.note do not exists --- ChangeLog | 1 + htdocs/comm/propal/list.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c49735f97e0..f18248c35fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Fix: wrong buy price update Fix: [ bug #1142 ] Set paiement on invoice (PGSql) Fix: [ bug #1145 ] Agenda button list type do not display Fix: [ bug #1148 ] Product consomation : supplier order bad status +Fix: [ bug #1159 ] Commercial search "other" give p.note do not exists ***** ChangeLog for 3.4.1 compared to 3.4.0 ***** Fix: Display buying price on line edit when no supplier price is defined diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 2e3b70a8ca3..aba10e2ca69 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -167,7 +167,7 @@ if ($search_montant_ht) { $sql.= " AND p.total_ht='".$db->escape(price2num(trim($search_montant_ht)))."'"; } -if ($sall) $sql.= " AND (s.nom LIKE '%".$db->escape($sall)."%' OR p.note LIKE '%".$db->escape($sall)."%' OR pd.description LIKE '%".$db->escape($sall)."%')"; +if ($sall) $sql.= " AND (s.nom LIKE '%".$db->escape($sall)."%' OR p.note_private LIKE '%".$db->escape($sall)."%' OR p.note_public LIKE '%".$db->escape($sall)."%' OR pd.description LIKE '%".$db->escape($sall)."%')"; if ($socid) $sql.= ' AND s.rowid = '.$socid; if ($viewstatut <> '') { From 5b2f9af7dc1d42d8b528a020177c635119e27f72 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Thu, 28 Nov 2013 16:44:57 +0100 Subject: [PATCH 04/11] fix management of all errors messages --- .../societe/mod_codeclient_elephant.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index c66045eca26..601b6743ad4 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -3,6 +3,7 @@ * Copyright (C) 2006-2009 Laurent Destailleur * Copyright (C) 2007-2012 Regis Houssin * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2013 Philippe Grand * * 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 @@ -131,6 +132,16 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode $langs->load("errors"); $examplecust=$langs->trans($examplecust); } + if($examplecust=="ErrorCantUseRazIfNoYearInMask") + { + $langs->load("errors"); + $examplecust=$langs->trans($examplecust); + } + if($examplecust=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask") + { + $langs->load("errors"); + $examplecust=$langs->trans($examplecust); + } } if ($type == 1 || $type == -1) { @@ -144,6 +155,16 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode $langs->load("errors"); $examplesup=$langs->trans($examplesup); } + if($examplesup=="ErrorCantUseRazIfNoYearInMask") + { + $langs->load("errors"); + $examplesup=$langs->trans($examplesup); + } + if($examplesup=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask") + { + $langs->load("errors"); + $examplesup=$langs->trans($examplesup); + } } if ($type == 0) return $examplecust; From a0c0578863ba6bd849fb2cc208e4accd9ffe1755 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Nov 2013 19:06:34 +0100 Subject: [PATCH 05/11] No need to send email for each error. First one is enough. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index efa6b3f28fc..26d4c64fef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ notifications: email: on_success: never # [always|never|change] default: change - on_failure: always # [always|never|change] default: always + on_failure: change # [always|never|change] default: always services: - memcached # will start memcached From 438d7b0fb2aebfb610f81bf975f0b36b4063a483 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 29 Nov 2013 11:04:22 +0100 Subject: [PATCH 06/11] fix regression --- htdocs/langs/ca_ES/admin.lang | 2 +- htdocs/langs/de_AT/admin.lang | 2 +- htdocs/langs/de_DE/admin.lang | 2 +- htdocs/langs/el_GR/admin.lang | 2 +- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/es_ES/admin.lang | 2 +- htdocs/langs/fr_FR/admin.lang | 2 +- htdocs/langs/it_IT/admin.lang | 2 +- htdocs/langs/ko_KR/admin.lang | 2 +- htdocs/langs/nl_NL/admin.lang | 2 +- htdocs/langs/pt_BR/admin.lang | 2 +- htdocs/langs/sl_SI/admin.lang | 2 +- htdocs/langs/tr_TR/admin.lang | 2 +- htdocs/langs/uz_UZ/admin.lang | 2 +- htdocs/langs/vi_VN/admin.lang | 2 +- htdocs/langs/zh_CN/admin.lang | 2 +- htdocs/langs/zh_TW/admin.lang | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 09185417b95..13f3edd6840 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Exemples amb la configuració activa actual ListOfDirectories=Llistat de directoris de plantilles OpenDocument ListOfDirectoriesForModelGenODT=Llistat de directoris amb documents model OpenDocument.

Indiqueu el camí complet del directori.
Afegir un retorn a la línia entre cada directori.Per indicar un directori del mòdul GED, indiqueu DOL_DATA_ROOT/ecm/nomdeldirectori.

Els arxius de plantilla d'aquests directoris han d'acabar amb .odt NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT trobats en aquest(s) directori(s) -ExampleOfDirectoriesForModelGen=Exemples de sintaxi:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Exemples de sintaxi:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT FirstnameNamePosition=Ordre visualització nom/cognoms diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index 1404dda1b06..4bd29990e0c 100644 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -1071,7 +1071,7 @@ ExamplesWithCurrentSetup=Beispiele mit der derzeitigen Systemkonfiguration ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien mit OpenDocument-Format.

Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.
Trennen Sie jedes Verzeichnis mit einer Zeilenschaltung
Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein DOL_DATA_ROOT/ecm/yourdirectoryname.

Dateien in diesen Verzeichnissen müssen auf .odt enden. NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt-Dokumentvorlagen -ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/ecmdir FirstnameNamePosition=Reihenfolge von Vor- und Nachname Module23Name=Energie Module23Desc=Überwachung des Energieverbrauchs diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index eecaaf3706d..5f930167b8c 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Beispiele mit der derzeitigen Systemkonfiguration ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien mit OpenDocument-Format.

Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.
Trennen Sie jedes Verzeichnis mit einer Zeilenschaltung
Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein DOL_DATA_ROOT/ecm/yourdirectoryname.

Dateien in diesen Verzeichnissen müssen auf .odt enden. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
Lesen Sie die Wiki Dokumentation um zu wissen, wie Sie Ihre odt Dokumentenvorlage erstellen, bevor Sie diese in den Kategorien speichern: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Reihenfolge von Vor- und Nachname diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 2f5113dcced..87a41062314 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Examples with current running setup ListOfDirectories=List of OpenDocument templates directories ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Θέση ονόματος/επιθέτου diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 34a3326ca2a..ee1247b72d1 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -317,7 +317,7 @@ ExamplesWithCurrentSetup=Examples with current running setup ListOfDirectories=List of OpenDocument templates directories ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index e7c22c83375..ef4bb836237 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Ejemplos con la configuración activa actual ListOfDirectories=Listado de directorios de plantillas OpenDocument ListOfDirectoriesForModelGenODT=Listado de directorios con plantillas de documentos OpenDocument.

Indicar la ruta completa del directorio.
Añadir un retorno a la línea entre cada directorio.Para indicar un directorio del módulo GED, indicar DOL_DATA_ROOT/ecm/nombredeldirectorio.

Los archivos de plantilla de estos directorios deben terminar con .odt NumberOfModelFilesFound=Número de archivos de plantillas ODT encontrados en este/estos directorio(s) -ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Ejemplos de sintaxis:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=Colocando los siguientes tags en la plantilla, obtendrá una sustitución con el valor personalizado al generar el documento: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT FirstnameNamePosition=Orden visualización nombre/apellidos diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index d441b493cb1..e4f8da3799f 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -317,7 +317,7 @@ ExamplesWithCurrentSetup=Exemples avec le paramétrage actif courant ListOfDirectories=Liste des répertoires des modèles OpenDocument ListOfDirectoriesForModelGenODT=Liste des répertoires contenant des documents modèles OpenDocument.

Indiquer les chemins complets de répertoire.
Ajouter un retour à la ligne entre chaque répertoire.
Pour indiquer un répertoire du module GED, indiquer
DOL_DATA_ROOT/ecm/nomdurepertoireged

Les fichiers modèles dans ces répertoires doivent se terminer par .odt. NumberOfModelFilesFound=Nombre de fichiers modèles ODT/ODS trouvés dans ce(s) répertoire(s) -ExampleOfDirectoriesForModelGen=Exemple de syntaxe :
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Exemple de syntaxe :
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
Pour savoir comment rédiger des modèles de document odt avant de les placer dans un de ces répertoires, consulter la documentation du wiki : FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Créer_un_modèle_de_document_ODT FirstnameNamePosition=Ordre d'affichage prénom/nom diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 97767f417e8..8895e682a8d 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Esempi di funzionamento secondo la configurazione attua ListOfDirectories=Elenco delle directory dei modelli OpenDocument ListOfDirectoriesForModelGenODT=Elenco di directory contenenti i modelli di file per il formato OpenDocument.
Inserisci il percorso completo della directory.

Vai a capo tra una directory e l'altra.

Per aggiungere una directory del modulo GED, aggiungi DOL_DATA_ROOT/ECM/nome directory

I file in queste directory devono avere l'estensione.odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Esempi di sintassi:
c: dir \\
/Home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Esempi di sintassi:
c: dir \\
/Home/mydir
DOL_DATA_ROOT/ECM/ecmdir FollowingSubstitutionKeysCanBeUsed=
Per sapere come creare i modelli di documento odt, prima di salvarli in queste directory, leggere la documentazione wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Posizione del cognome/nome diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index abbd9a29cfa..570b2490a01 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -316,7 +316,7 @@ VersionLastUpgrade=최종 버전 업그레이드 # ListOfDirectories=List of OpenDocument templates directories # ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir # FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: # FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template # FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 92d38904856..0ab375acab5 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Voorbeelden met de huidige actieve configuratie ListOfDirectories=Lijst van OpenDocument sjablonenmappen ListOfDirectoriesForModelGenODT=Lijst van mappen met sjablonen in OpenDocument-formaat.

Vul hier het volledige pad naar de mappen in.
Voeg een harde return in tussen elke map.
Om een map van de GED-module toe te voegen, voeg hier dan DOL_DATA_ROOT/ECM/uwmapnaam in.

Bestanden in deze mappen dienen te eindigen op .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Voorbeelden van de syntaxis:
c:\\mijndir
/home/mijndir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Voorbeelden van de syntaxis:
c:\\mijndir
/home/mijndir
DOL_DATA_ROOT/ECM/ecmdir FollowingSubstitutionKeysCanBeUsed=Door het plaatsen van de volgende velden in het sjabloon krijgt u een vervanging met de aangepaste waarde bij het genereren van het document: FullListOnOnlineDocumentation=De complete lijst met beschikbare velden is te vinden in de gebruikersdocumentatie op de Wiki van Dolibar: http://wiki.dolibarr.org. FirstnameNamePosition=Positie van voornaam / achternaam diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 7e56f778e25..874cbbd1168 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -316,7 +316,7 @@ SeeWikiForAllTeam=Veja o wiki para mais detalhes de todos os autores e da sua or # ListOfDirectories=List of OpenDocument templates directories # ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir # FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: # FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template # FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 4fd8b5871dd..cd95bae1259 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Primeri pri trenutno veljavnih nastavitvah ListOfDirectories=Seznam map z OpenDocument predlogami ListOfDirectoriesForModelGenODT=Seznam imenikov, ki vsebujejo datoteke predlog v formatu OpenDocument.

Tukaj vstavite celotno pot imenikov.
Dodajte prelom vrstice CR med med vsako mapo.
Če želite dodati mapo GED modula, dodajte tukaj DOL_DATA_ROOT/ecm/imevašemape.

Datoteke v teh mapah morajo imeti končnico .odt # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Primeri sintakse:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Primeri sintakse:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=Z dodatkom takih oznak v predlogo, boste ob kreiranju dokumenta dobili personalizirane vrednosti: FullListOnOnlineDocumentation=http://wiki.dolibarr.org FirstnameNamePosition=Položaj imena/priimka diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 1d0fe2dd860..57a8b5b193b 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=Geçerli çalışan ayarlama örnekleri ListOfDirectories=OpenDocument (AçıkBelge) temaları dizin listesi ListOfDirectoriesForModelGenODT=OpenDocument (AçıkBelge) biçimli şablon dosyalarını içeren dizinler listesi.

Buraya tam yol dizinlerini koyun.
Her dizin arasına satır başı ekleyin.
GED modülü dizini eklemek için buraya ekleyinDOL_DATA_ROOT/ecm/yourdirectoryname.

O dizinlerdeki dosyalar.odt ile bitmelidir. NumberOfModelFilesFound=O dizinlerde bulunan ODT/ODS şablon dosyası sayısı -ExampleOfDirectoriesForModelGen=Sözdizimi örnekleri:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=Sözdizimi örnekleri:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
Odt belge şablonlarının nasıl oluşturulacağını öğrenmek için o dizinlere kaydetmeden önce, wiki belgelerini okuyun: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Ad/Soyad konumu diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index 98ecabf4eaf..97ab6ed2301 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -316,7 +316,7 @@ # ListOfDirectories=List of OpenDocument templates directories # ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir # FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: # FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template # FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index 6d7decb64ea..917806871b2 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -316,7 +316,7 @@ ModuleFamilyBase=Hệ thống # ListOfDirectories=List of OpenDocument templates directories # ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +# ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir # FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: # FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template # FirstnameNamePosition=Position of Name/Lastname diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 7cc26f109fa..290c0c5e969 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=当前运行设置的实例 ListOfDirectories=OpenDocument 文档模板目录清单 ListOfDirectoriesForModelGenODT=请输入含有 OpenDocument 格式范本的目录字串。

1. 输入全名称路径。
2. 在每个目录项目之间加入 carriage return 字元。
3. 增加 GED 模块目录，如右：DOL_DATA_ROOT/ecm/yourdirectoryname

4. 在这些目录中的文件副档名必须是.odt。 NumberOfModelFilesFound=这些目录中找到的ODT / ODS模板文件数目 -ExampleOfDirectoriesForModelGen=语法格式：
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=语法格式：
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
要知道如何建立您的ODT文建范本，并储存在这些目录，请上读上　wiki　网站： FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=姓 /名 位置顺序 diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 2f243b00955..e72668f06be 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -316,7 +316,7 @@ ExamplesWithCurrentSetup=與當前正在運行的安裝實例 ListOfDirectories=OpenDocument 的文件範本目錄清單 ListOfDirectoriesForModelGenODT=請輸入含有 OpenDocument 格式範本的目錄字串。

1. 輸入全名稱路徑。
2. 在每個目錄項目之間加入 carriage return 字元。
3. 增加 GED 模組目錄，如右：DOL_DATA_ROOT/ecm/yourdirectoryname
4. 在這些目錄中的檔案副檔名必須是.odt # NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=範例：
1. ç:\\mydir
2. /home/mydir
3. DOL_DATA_ROOT/ecm/Pub/ecmdir +ExampleOfDirectoriesForModelGen=範例：
1. ç:\\mydir
2. /home/mydir
3. DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
要知道如何建立您的ODT文建範本，並儲存在這些目錄，請上讀上　wiki　網站： FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=的名字位置/名稱 From d024ec3daa23d48010a7f08980c6f2a44a51cacf Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 29 Nov 2013 11:29:39 +0100 Subject: [PATCH 07/11] fix management of all errors message --- .../societe/mod_codeclient_elephant.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index c66045eca26..601b6743ad4 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -3,6 +3,7 @@ * Copyright (C) 2006-2009 Laurent Destailleur * Copyright (C) 2007-2012 Regis Houssin * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2013 Philippe Grand * * 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 @@ -131,6 +132,16 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode $langs->load("errors"); $examplecust=$langs->trans($examplecust); } + if($examplecust=="ErrorCantUseRazIfNoYearInMask") + { + $langs->load("errors"); + $examplecust=$langs->trans($examplecust); + } + if($examplecust=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask") + { + $langs->load("errors"); + $examplecust=$langs->trans($examplecust); + } } if ($type == 1 || $type == -1) { @@ -144,6 +155,16 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode $langs->load("errors"); $examplesup=$langs->trans($examplesup); } + if($examplesup=="ErrorCantUseRazIfNoYearInMask") + { + $langs->load("errors"); + $examplesup=$langs->trans($examplesup); + } + if($examplesup=="ErrorCantUseRazInStartedYearIfNoYearMonthInMask") + { + $langs->load("errors"); + $examplesup=$langs->trans($examplesup); + } } if ($type == 0) return $examplecust; From 22d31817deaf5702adb8d255a2c09d4dfaa4a8a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Salvador?= Date: Thu, 28 Nov 2013 09:16:51 +0100 Subject: [PATCH 08/11] made getVATRates synchronous to avoid concurrency problems --- htdocs/core/tpl/objectline_add.tpl.php | 33 ++++++++++++++------------ 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php index 6e1c3c687f9..92f965ad968 100644 --- a/htdocs/core/tpl/objectline_add.tpl.php +++ b/htdocs/core/tpl/objectline_add.tpl.php @@ -242,7 +242,6 @@ $(document).ready(function() { $('#service_duration_area').hide(); $('#idprod').change(function() { - if ($(this).val() > 0) { // Update vat rate combobox @@ -260,11 +259,11 @@ $(document).ready(function() { if (typeof data != 'undefined') { $('#product_ref').val(data.ref); $('#product_label').val(data.label); + $('#origin_tva_tx_cache').val(data.tva_tx); $('#price_base_type').val(data.pricebasetype).trigger('change'); $('#price_ht').val(data.price_ht).trigger('change'); $('#origin_price_ht_cache').val(data.price_ht); //$('#origin_price_ttc_cache').val(data.price_ttc); - $('#origin_tva_tx_cache').val(data.tva_tx); $('#select_type').val(data.type).attr('disabled','disabled').trigger('change'); //$('#price_base_type_area').show(); $('#qty').val(data.qty); @@ -283,9 +282,6 @@ $(document).ready(function() { $('#price_ttc').val(''); - // Restore vat rate combobox - getVATRates('getSellerVATRates', 'tva_tx'); - // For compatibility with combobox global->PRODUIT_USE_SEARCH_TO_SELECT)) { ?> $('#select_type').val('').removeAttr('disabled').trigger('change'); @@ -461,16 +457,23 @@ $(document).ready(function() { function getVATRates(action, htmlname, idprod) { var productid = (idprod?idprod:0); - $.post('/core/ajax/vatrates.php', { - 'action': action, - 'id': id; ?>, - 'productid': productid, - 'htmlname': htmlname }, - function(data) { - if (typeof data != 'undefined' && data.error == null) { - $("#" + htmlname).html(data.value).trigger('change'); - } - }, 'json'); + $.ajax({ + type: "POST", + url: '/core/ajax/vatrates.php', + data: { + 'action': action, + 'id': id; ?>, + 'productid': productid, + 'htmlname': htmlname + }, + success: function(data){ + if (typeof data != 'undefined' && data.error == null) { + $("#" + htmlname).html(data.value).trigger('change'); + } + }, + dataType: "json", + async: false + }); } // Check if decription is not empty for free line From a7c246cec1590d33c7e63ca69eeb9509fd3d9b0e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 1 Dec 2013 15:20:57 +0100 Subject: [PATCH 09/11] Check parameters of script --- build/makepack-dolibarr.pl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 4537c68d7e2..44c3ede1489 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -59,6 +59,14 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; $SOURCE="$DIR/.."; $DESTI="$SOURCE/build"; +if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"}) +{ + print "Error: Missing environment variables.\n"; + print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n"; + print "$PROG.$Extension aborted.\n"; + sleep 2; + exit 1; +} # Detect OS type # -------------- @@ -66,7 +74,7 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS=' elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; } elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; } if (! $OS) { - print "$PROG.$Extension was not able to detect your OS.\n"; + print "Error: Can't detect your OS.\n"; print "Can't continue.\n"; print "$PROG.$Extension aborted.\n"; sleep 2; @@ -105,8 +113,8 @@ for (0..@ARGV-1) { $FILENAMESNAPSHOT.="-".$PREFIX; } } -if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i) { $DESTI = $ENV{"DESTIBETARC"}; } # Force output dir if env DESTI is defined -if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; } # Force output dir if env DESTI is defined +if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i) { $DESTI = $ENV{"DESTIBETARC"}; } # Force output dir if env DESTI is defined +if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; } # Force output dir if env DESTI is defined print "Makepack version $VERSION\n"; From 71a85464d562ed93b62cd38a71ac167c7e017042 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 1 Dec 2013 15:20:57 +0100 Subject: [PATCH 10/11] Check parameters of script --- build/makepack-dolibarr.pl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 6390e6c81f5..85e6061a520 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -59,6 +59,14 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; $SOURCE="$DIR/.."; $DESTI="$SOURCE/build"; +if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"}) +{ + print "Error: Missing environment variables.\n"; + print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n"; + print "$PROG.$Extension aborted.\n"; + sleep 2; + exit 1; +} # Detect OS type # -------------- @@ -66,7 +74,7 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS=' elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; } elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; } if (! $OS) { - print "$PROG.$Extension was not able to detect your OS.\n"; + print "Error: Can't detect your OS.\n"; print "Can't continue.\n"; print "$PROG.$Extension aborted.\n"; sleep 2; @@ -105,8 +113,8 @@ for (0..@ARGV-1) { $FILENAMESNAPSHOT.="-".$PREFIX; } } -if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i) { $DESTI = $ENV{"DESTIBETARC"}; } # Force output dir if env DESTI is defined -if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; } # Force output dir if env DESTI is defined +if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i) { $DESTI = $ENV{"DESTIBETARC"}; } # Force output dir if env DESTI is defined +if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; } # Force output dir if env DESTI is defined print "Makepack version $VERSION\n"; From f86cf6c440f069066925dc7fe70e3a4749326655 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 1 Dec 2013 15:20:57 +0100 Subject: [PATCH 11/11] Check parameters of script --- build/makepack-dolibarr.pl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index d6273caec17..5d7ece90c9f 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -67,6 +67,14 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; $SOURCE="$DIR/.."; $DESTI="$SOURCE/build"; +if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"}) +{ + print "Error: Missing environment variables.\n"; + print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n"; + print "$PROG.$Extension aborted.\n"; + sleep 2; + exit 1; +} # Detect OS type # -------------- @@ -74,7 +82,7 @@ if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS=' elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; } elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; } if (! $OS) { - print "$PROG.$Extension was not able to detect your OS.\n"; + print "Error: Can't detect your OS.\n"; print "Can't continue.\n"; print "$PROG.$Extension aborted.\n"; sleep 2; @@ -113,8 +121,8 @@ for (0..@ARGV-1) { $FILENAMESNAPSHOT.="-".$PREFIX; } } -if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i) { $DESTI = $ENV{"DESTIBETARC"}; } # Force output dir if env DESTI is defined -if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; } # Force output dir if env DESTI is defined +if ($ENV{"DESTIBETARC"} && $BUILD =~ /[a-z]/i) { $DESTI = $ENV{"DESTIBETARC"}; } # Force output dir if env DESTI is defined +if ($ENV{"DESTISTABLE"} && $BUILD =~ /^[0-9]+$/) { $DESTI = $ENV{"DESTISTABLE"}; } # Force output dir if env DESTI is defined print "Makepack version $VERSION\n";