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 17.0

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

6
htdocs/core/class/commonobject.class.php
View File

@ -9600,6 +9600,12 @@ abstract class CommonObject
} }
} }
// Delete linked object
$res = $this->deleteObjectLinked();
if ($res < 0) {
$error++;
}
if (!$error && !empty($this->isextrafieldmanaged)) { if (!$error && !empty($this->isextrafieldmanaged)) {
$result = $this->deleteExtraFields(); $result = $this->deleteExtraFields();
if ($result < 0) { if ($result < 0) {

5
htdocs/fichinter/list.php
View File

@ -498,7 +498,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
print '<div class="div-table-responsive">'; print '<div class="div-table-responsive">';
print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n"; print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
// Fields title search // Fields title search
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@ -865,6 +865,9 @@ while ($i < $imaxinloop) {
if (!$i) { if (!$i) {
$totalarray['type'][$totalarray['nbfield']] = 'duration'; $totalarray['type'][$totalarray['nbfield']] = 'duration';
} }
if (!$i) {
$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
}
$totalarray['val']['fd.duree'] += $obj->duree; $totalarray['val']['fd.duree'] += $obj->duree;
} }
// Action column // Action column

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

@ -500,11 +500,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");
} }

5
htdocs/projet/class/taskstats.class.php
View File

@ -15,6 +15,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@ -195,7 +196,7 @@ class TaskStats extends Stats
} }
/** /**
* Return the Task amount by month for a year * Return the Task amount by month for a year
* *
* @param int $year Year to scan * @param int $year Year to scan
@ -208,7 +209,7 @@ class TaskStats extends Stats
return array(); return array();
} }
/** /**
* Return average of entity by month * Return average of entity by month
* @param int $year year number * @param int $year year number
* @return int value * @return int value

6
htdocs/projet/tasks/time.php
View File

@ -191,7 +191,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
$search_project_ref = ''; $search_project_ref = '';
$search_project_label = ''; $search_project_label = '';
$search_task_label = ''; $search_task_label = '';
$search_user = 0; $search_user = -1;
$search_valuebilled = ''; $search_valuebilled = '';
$search_product_ref = ''; $search_product_ref = '';
$toselect = array(); $toselect = array();
@ -1446,7 +1446,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
print $langs->trans('InvoiceToUse'); print $langs->trans('InvoiceToUse');
print '</td>'; print '</td>';
print '<td>'; print '<td>';
$form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'), 1, 0, 0, 'maxwidth500', '', 'all'); $form->selectInvoice($projectstatic->thirdparty->id, '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'), 1, 0, 0, 'maxwidth500', '', 'all');
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
/*print '<tr>'; /*print '<tr>';
@ -1561,7 +1561,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
if (empty($search_user)) { if (empty($search_user)) {
$search_user = $user->id; $search_user = $user->id;
} }
$sql .= " AND t.fk_user = ".((int) $search_user); if ($search_user > 0) $sql .= " AND t.fk_user = ".((int) $search_user);
} }
if ($search_note) { if ($search_note) {