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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-06-24 16:31:09 +02:00
commit 202fbf5e7d
18 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/bom/mod_bom_advanced.php
View File

@ -23,7 +23,7 @@
/**
* \file htdocs/core/modules/bom/mod_bom_advanced.php
* \ingroup bom
* \brief Fichier contenant la classe du modele de numerotation de reference de bom advanced
* \brief File containing class for numbering model of bom advanced
*/
require_once DOL_DOCUMENT_ROOT .'/core/modules/bom/modules_bom.php';
@ -52,7 +52,7 @@ class mod_bom_advanced extends ModeleNumRefboms
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
View File

@ -46,7 +46,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

4
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
View File

@ -27,7 +27,7 @@
/**
* \file htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
* \ingroup commande
* \brief Fichier de la classe permettant de generer les commandes au modele Eratosthène
* \brief File of the class allowing to generate the orders to the Eratosthene model
*/
require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
/**
* Classe to generate PDF orders with template Eratosthene
* Class to generate PDF orders with template Eratosthene
*/
class pdf_eratosthene extends ModelePDFCommandes
{

2
htdocs/core/modules/commande/mod_commande_saphir.php
View File

@ -52,7 +52,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/expensereport/mod_expensereport_sand.php
View File

@ -55,7 +55,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/facture/mod_facture_mars.php
View File

@ -62,7 +62,7 @@ class mod_facture_mars extends ModeleNumRefFactures
}
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/facture/mod_facture_mercure.php
View File

@ -46,7 +46,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/facture/mod_facture_terre.php
View File

@ -72,7 +72,7 @@ class mod_facture_terre extends ModeleNumRefFactures
}
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/fichinter/mod_arctic.php
View File

@ -57,7 +57,7 @@ class mod_arctic extends ModeleNumRefFicheinter
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/livraison/mod_livraison_jade.php
View File

@ -61,7 +61,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/livraison/mod_livraison_saphir.php
View File

@ -56,7 +56,7 @@ class mod_livraison_saphir extends ModeleNumRefDeliveryOrder
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/payment/mod_payment_ant.php
View File

@ -55,7 +55,7 @@ class mod_payment_ant extends ModeleNumRefPayments
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/project/mod_project_universal.php
View File

@ -55,7 +55,7 @@ class mod_project_universal extends ModeleNumRefProjects
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/project/task/mod_task_universal.php
View File

@ -55,7 +55,7 @@ class mod_task_universal extends ModeleNumRefTask
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
View File

@ -57,7 +57,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
View File

@ -55,7 +55,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

2
htdocs/core/modules/ticket/mod_ticket_universal.php
View File

@ -53,7 +53,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
public $name='Universal';
/**
* Renvoi la description du modele de numerotation
* Returns the description of the numbering model
*
* @return string Texte descripif
*/

4
htdocs/modulebuilder/template/myobject_document.php
View File

@ -81,8 +81,8 @@ $extralabels = $extrafields->fetch_name_optionals_label('myobject');
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity?$object->entity:1] . "/myobject/" . dol_sanitizeFileName($object->id);
if ($id > 0 || ! empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity?$object->entity:1] . "/myobject/" . dol_sanitizeFileName($object->ref);
//if ($id > 0 || ! empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity?$object->entity:$conf->entity] . "/myobject/" . dol_sanitizeFileName($object->id);
if ($id > 0 || ! empty($ref)) $upload_dir = $conf->mymodule->multidir_output[$object->entity?$object->entity:$conf->entity] . "/myobject/" . dol_sanitizeFileName($object->ref);
/*