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 21.0

Browse Source
This commit is contained in:
ldestailleur
2025-05-10 12:42:51 +02:00
parent b0501b1c35 b343a7b910
commit d3d8f02433
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/stats/cabyprodserv.php
View File

@@ -296,12 +296,6 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
$periodlink = ''; $periodlink = '';
} }
$builddate = 0;
$calcmode = '';
$name = '';
$period = '';
$periodlink = '';
report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode); report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') { if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') {

1
htdocs/core/lib/functions.lib.php
View File

@@ -13290,6 +13290,7 @@ function getElementProperties($elementType)
$parent_element = 'facture'; $parent_element = 'facture';
} elseif ($elementType == 'facturerec') { } elseif ($elementType == 'facturerec') {
$classpath = 'compta/facture/class'; $classpath = 'compta/facture/class';
$classfile = 'facture-rec';
$module = 'facture'; $module = 'facture';
$classname = 'FactureRec'; $classname = 'FactureRec';
} elseif ($elementType == 'commande' || $elementType == 'order') { } elseif ($elementType == 'commande' || $elementType == 'order') {

6
htdocs/product/card.php
View File

@@ -1628,7 +1628,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
// Default workstation // Default workstation
print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>'; print '<tr><td>'.$langs->trans("DefaultWorkstation").'</td><td>';
print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"'); print img_picto($langs->trans("DefaultWorkstation"), 'workstation', 'class="pictofixedwidth"');
print $formproduct->selectWorkstations($object->fk_default_workstation, 'fk_default_workstation', 1); print $formproduct->selectWorkstations((GETPOSTISSET('fk_default_workstation') ? GETPOSTINT('fk_default_workstation') : ''), 'fk_default_workstation', 1);
print '</td></tr>'; print '</td></tr>';
} }
@@ -1643,7 +1643,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
if ($object->duration_value > 0) { if ($object->duration_value > 0) {
print ' &nbsp; &nbsp; '; print ' &nbsp; &nbsp; ';
} }
print '<input type="checkbox" class="marginleftonly valignmiddle" id="mandatoryperiod" name="mandatoryperiod"'.($object->mandatory_period == 1 ? ' checked="checked"' : '').'>'; print '<input type="checkbox" class="marginleftonly valignmiddle" id="mandatoryperiod" name="mandatoryperiod"'.(GETPOSTISSET('mandatoryperiod') ? ' checked="checked"' : '').'>';
print '<label for="mandatoryperiod">'; print '<label for="mandatoryperiod">';
$htmltooltip = $langs->trans("mandatoryHelper"); $htmltooltip = $langs->trans("mandatoryHelper");
if (!getDolGlobalString('SERVICE_STRICT_MANDATORY_PERIOD')) { if (!getDolGlobalString('SERVICE_STRICT_MANDATORY_PERIOD')) {
@@ -1712,7 +1712,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio
if (getDolGlobalString('PRODUCT_USE_UNITS')) { if (getDolGlobalString('PRODUCT_USE_UNITS')) {
print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>'; print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';
print '<td>'; print '<td>';
print $form->selectUnits(empty($line->fk_unit) ? getDolGlobalString('PRODUCT_USE_UNITS') : $line->fk_unit, 'units'); print $form->selectUnits(GETPOSTISSET('unit') ? GETPOST('unit', 'alpha') : (GETPOST('unit', 'alpha') ?: '0'), 'units');
print '</td></tr>'; print '</td></tr>';
} }

4
htdocs/societe/list.php
View File

@@ -1296,9 +1296,9 @@ $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'u.statu
$userlist[-2] = $langs->trans("NoSalesRepresentativeAffected"); $userlist[-2] = $langs->trans("NoSalesRepresentativeAffected");
if ($user->hasRight("societe", "client", "voir") || $socid) { if ($user->hasRight("societe", "client", "voir") || $socid) {
$moreforfilter .= '<div class="divsearchfield">'; $moreforfilter .= '<div class="divsearchfield">';
$tmptitle = $langs->trans('SalesRepresentatives'); $tmptitle = $langs->transnoentitiesnoconv('SalesRepresentatives');
$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"'); $moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"');
$moreforfilter .= $form->multiselectarray('search_sale', $userlist, $search_sale, 0, 0, '', 0, 300, '', '', $langs->trans('SalesRepresentatives'), 1); $moreforfilter .= $form->multiselectarray('search_sale', $userlist, $search_sale, 0, 0, '', 0, 300, '', '', $langs->transnoentitiesnoconv('SalesRepresentatives'), 1);
$moreforfilter .= '</div>'; $moreforfilter .= '</div>';
} }
if (!empty($moreforfilter)) { if (!empty($moreforfilter)) {