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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-12-21 21:00:57 +01:00
commit dc1c31c948
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/modulebuilder/template/admin/setup.php
View File

@ -55,6 +55,9 @@ global $langs, $user;
// Libraries // Libraries
require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php"; require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
require_once '../lib/mymodule.lib.php'; require_once '../lib/mymodule.lib.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
//require_once "../class/myclass.class.php"; //require_once "../class/myclass.class.php";
// Translations // Translations

4
htdocs/projet/card.php
View File

@ -489,11 +489,11 @@ llxHeader("", $title, $help_url);
$titleboth = $langs->trans("LeadsOrProjects"); $titleboth = $langs->trans("LeadsOrProjects");
$titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default $titlenew = $langs->trans("NewLeadOrProject"); // Leads and opportunities by default
if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { if (!getDolGlobalInt('PROJECT_USE_OPPORTUNITIES')) {
$titleboth = $langs->trans("Projects"); $titleboth = $langs->trans("Projects");
$titlenew = $langs->trans("NewProject"); $titlenew = $langs->trans("NewProject");
} }
if ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) { // 2 = leads only if (getDolGlobalInt('PROJECT_USE_OPPORTUNITIES') == 2) { // 2 = leads only
$titleboth = $langs->trans("Leads"); $titleboth = $langs->trans("Leads");
$titlenew = $langs->trans("NewLead"); $titlenew = $langs->trans("NewLead");
} }