Skip to content

Ensure diffusion modulepart directories are registered #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mapiolca wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Ensure diffusion modulepart directories are registered #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe3777a
Ensure diffusion modulepart directories are registered
mapiolca Oct 6, 2025
f00636e
Extend diffusion PDF with contacts and attachments
mapiolca Oct 6, 2025
01af1f7
Merge branch 'main' into codex/fix-tcpdf-output-file-error-joof8h
mapiolca Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions class/diffusion.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
*/

// Put here all includes required by your class file
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

Expand Down Expand Up @@ -184,42 +184,42 @@ class Diffusion extends CommonObject
*
* @param DoliDB $db Database handler
*/
public function __construct(DoliDB $db)
{
global $conf, $langs;

$this->db = $db;
$this->ismultientitymanaged = 0;
$this->isextrafieldmanaged = 1;

$entity = !empty($conf->entity) ? (int) $conf->entity : 1;

if (!isset($conf->diffusionplans) || !is_object($conf->diffusionplans)) {
$conf->diffusionplans = new stdClass();
}

if (empty($conf->diffusionplans->dir_output)) {
$conf->diffusionplans->dir_output = DOL_DATA_ROOT.($entity > 1 ? '/'.$entity : '').'/diffusionplans';
}

if (empty($conf->diffusionplans->multidir_output) || !is_array($conf->diffusionplans->multidir_output)) {
$conf->diffusionplans->multidir_output = array();
}

if (empty($conf->diffusionplans->multidir_output[$entity])) {
$conf->diffusionplans->multidir_output[$entity] = $conf->diffusionplans->dir_output;
}

$this->modulepart = 'diffusion';
$this->dir_output = $conf->diffusionplans->dir_output.'/diffusion';

if (!empty($this->dir_output)) {
dol_mkdir($this->dir_output);
}

if (!getDolGlobalInt('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
$this->fields['rowid']['visible'] = 0;
}
public function __construct(DoliDB $db)
{
global $conf, $langs;
$this->db = $db;
$this->ismultientitymanaged = 0;
$this->isextrafieldmanaged = 1;
$entity = !empty($conf->entity) ? (int) $conf->entity : 1;
if (!isset($conf->diffusionplans) || !is_object($conf->diffusionplans)) {
$conf->diffusionplans = new stdClass();
}
if (empty($conf->diffusionplans->dir_output)) {
$conf->diffusionplans->dir_output = DOL_DATA_ROOT.($entity > 1 ? '/'.$entity : '').'/diffusionplans';
}
if (empty($conf->diffusionplans->multidir_output) || !is_array($conf->diffusionplans->multidir_output)) {
$conf->diffusionplans->multidir_output = array();
}
if (empty($conf->diffusionplans->multidir_output[$entity])) {
$conf->diffusionplans->multidir_output[$entity] = $conf->diffusionplans->dir_output;
}
$this->modulepart = 'diffusion';
$this->dir_output = $conf->diffusionplans->dir_output.'/diffusion';
if (!empty($this->dir_output)) {
dol_mkdir($this->dir_output);
}
if (!getDolGlobalInt('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
$this->fields['rowid']['visible'] = 0;
}
if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
$this->fields['entity']['enabled'] = 0;
}
Expand Down
74 changes: 37 additions & 37 deletions class/diffusioncontact.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
*/

// Put here all includes required by your class file
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

Expand Down Expand Up @@ -172,41 +172,41 @@ class DiffusionContact extends CommonObject
*
* @param DoliDB $db Database handler
*/
public function __construct(DoliDB $db)
{
global $conf, $langs;

$this->db = $db;
$this->ismultientitymanaged = 0;
$this->isextrafieldmanaged = 1;

$entity = !empty($conf->entity) ? (int) $conf->entity : 1;

if (!isset($conf->diffusionplans) || !is_object($conf->diffusionplans)) {
$conf->diffusionplans = new stdClass();
}

if (empty($conf->diffusionplans->dir_output)) {
$conf->diffusionplans->dir_output = DOL_DATA_ROOT.($entity > 1 ? '/'.$entity : '').'/diffusionplans';
}

if (empty($conf->diffusionplans->multidir_output) || !is_array($conf->diffusionplans->multidir_output)) {
$conf->diffusionplans->multidir_output = array();
}

if (empty($conf->diffusionplans->multidir_output[$entity])) {
$conf->diffusionplans->multidir_output[$entity] = $conf->diffusionplans->dir_output;
}

$this->modulepart = 'diffusioncontact';
$this->dir_output = $conf->diffusionplans->dir_output.'/diffusioncontact';

if (!empty($this->dir_output)) {
dol_mkdir($this->dir_output);
}

if (!getDolGlobalInt('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
$this->fields['rowid']['visible'] = 0;
public function __construct(DoliDB $db)
{
global $conf, $langs;
$this->db = $db;
$this->ismultientitymanaged = 0;
$this->isextrafieldmanaged = 1;
$entity = !empty($conf->entity) ? (int) $conf->entity : 1;
if (!isset($conf->diffusionplans) || !is_object($conf->diffusionplans)) {
$conf->diffusionplans = new stdClass();
}
if (empty($conf->diffusionplans->dir_output)) {
$conf->diffusionplans->dir_output = DOL_DATA_ROOT.($entity > 1 ? '/'.$entity : '').'/diffusionplans';
}
if (empty($conf->diffusionplans->multidir_output) || !is_array($conf->diffusionplans->multidir_output)) {
$conf->diffusionplans->multidir_output = array();
}
if (empty($conf->diffusionplans->multidir_output[$entity])) {
$conf->diffusionplans->multidir_output[$entity] = $conf->diffusionplans->dir_output;
}
$this->modulepart = 'diffusioncontact';
$this->dir_output = $conf->diffusionplans->dir_output.'/diffusioncontact';
if (!empty($this->dir_output)) {
dol_mkdir($this->dir_output);
}
if (!getDolGlobalInt('MAIN_SHOW_TECHNICAL_ID') && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
$this->fields['rowid']['visible'] = 0;
}
if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
$this->fields['entity']['enabled'] = 0;
Expand Down
Loading