Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur (aka Eldy)
2025-02-13 20:42:23 +01:00
parent e70995ca7e 805d9a58ec
commit d223f8a0b9
10 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/modCommande.class.php
View File

@@ -94,11 +94,12 @@ class modCommande extends DolibarrModules
[
"COMMANDE_ADDON_PDF_ODT_PATH",
"chaine",
"DOL_DATA_ROOT/doctemplates/orders",
"DOL_DATA_ROOT".($conf->entity > 1 ? '/'.$conf->entity : '')."/doctemplates/orders",
"",
0,
],
];
/*$r++;
$this->const[$r][0] = "COMMANDE_DRAFT_WATERMARK";
$this->const[$r][1] = "chaine";
@@ -460,7 +461,7 @@ class modCommande extends DolibarrModules
//ODT template
$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/orders/template_order.odt';
$dirodt = DOL_DATA_ROOT.'/doctemplates/orders';
$dirodt = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/doctemplates/orders';
$dest = $dirodt.'/template_order.odt';
if (file_exists($src) && !file_exists($dest)) {