vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/patch-11' into patch-11

Browse source
This commit is contained in:
Frédéric FRANCE 2025-11-28 15:09:21 +01:00
commit cb4ed97867
No known key found for this signature in database
GPG key ID: C06E4A9656127239
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
htdocs/core/class/html.formfile.class.php
View file

@ -507,7 +507,7 @@ class FormFile
}
$printer = 0;
$supportedmoduleparts = ['stock', 'project', 'contract', 'facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket', 'bom', 'mrp:mo'];
$supportedmoduleparts = ['stock', 'ficheinter', 'user', 'project', 'contract', 'facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket', 'bom', 'mrp:mo'];
// The direct print feature is implemented only for such elements
if (in_array($modulepart, $supportedmoduleparts)) {
$printer = ($user->hasRight('printing', 'read') && isModEnabled('printing'));

10
htdocs/fichinter/card.php
View file

@ -66,14 +66,14 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page
$langs->loadLangs(array('bills', 'companies', 'interventions', 'stocks'));
$id = GETPOSTINT('id');
$ref = GETPOST('ref', 'alpha');
$id = GETPOSTINT('id');
$ref = GETPOST('ref', 'alpha');
$ref_client = GETPOST('ref_client', 'alpha');
$socid = GETPOSTINT('socid');
$contratid = GETPOSTINT('contratid');
$action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
$action = GETPOST('action', 'alpha');
$cancel = GETPOST('cancel', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
$mesg = GETPOST('msg', 'alpha');

2
htdocs/ticket/card.php
View file

@ -688,6 +688,8 @@ if (empty($reshook)) {
$action = 'view';
}
// Actions when printing a doc from card
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
$permissiondellink = $user->hasRight('ticket', 'write');
include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'

3
htdocs/user/card.php
View file

@ -879,6 +879,9 @@ if (empty($reshook)) {
// Actions to build doc
$upload_dir = $conf->user->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
// Actions when printing a doc from card
include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
}