From 17f6158fb147adacd77a5989161426cb73e000d0 Mon Sep 17 00:00:00 2001 From: sonikf <93765174+sonikf@users.noreply.github.com> Date: Mon, 5 May 2025 21:13:19 +0300 Subject: [PATCH 1/4] fix trans for non latin languages (#34059) --- htdocs/societe/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 08a4113c04c..31a24f56e96 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -1296,9 +1296,9 @@ $userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'u.statu $userlist[-2] = $langs->trans("NoSalesRepresentativeAffected"); if ($user->hasRight("societe", "client", "voir") || $socid) { $moreforfilter .= '
'; - $tmptitle = $langs->trans('SalesRepresentatives'); + $tmptitle = $langs->transnoentitiesnoconv('SalesRepresentatives'); $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 .= '
'; } if (!empty($moreforfilter)) { From 24ef9d1c0d78b1a90dbac51f19af99c1491cdbd0 Mon Sep 17 00:00:00 2001 From: atm-irvine <165771178+atm-irvine@users.noreply.github.com> Date: Tue, 6 May 2025 10:48:02 +0200 Subject: [PATCH 2/4] fix: missing classfile for facturerec getElementProperties (#34067) --- htdocs/core/lib/functions.lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 05e317ef11a..80931cb169e 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -13290,6 +13290,7 @@ function getElementProperties($elementType) $parent_element = 'facture'; } elseif ($elementType == 'facturerec') { $classpath = 'compta/facture/class'; + $classfile = 'facture-rec'; $module = 'facture'; $classname = 'FactureRec'; } elseif ($elementType == 'commande' || $elementType == 'order') { From dea5209feff75e8a15e50b72cde6e168039b6e15 Mon Sep 17 00:00:00 2001 From: atm-irvine <165771178+atm-irvine@users.noreply.github.com> Date: Wed, 7 May 2025 03:29:54 +0200 Subject: [PATCH 3/4] fix: removed useless redefined var in cabyprodserv (#34068) --- htdocs/compta/stats/cabyprodserv.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index a76a053dc27..4bd88636218 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -296,12 +296,6 @@ if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) { $periodlink = ''; } -$builddate = 0; -$calcmode = ''; -$name = ''; -$period = ''; -$periodlink = ''; - report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode); if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') { From b343a7b910069b6503f3740423f84dfc26d38e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 9 May 2025 23:48:07 +0200 Subject: [PATCH 4/4] fix input with PRODUCT_USE_UNITS at create step (#34081) * fix input with PRODUCT_USE_UNITS at create step * Update card.php * Update card.php --- htdocs/product/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index e10dbc20e46..6f873bd888b 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1628,7 +1628,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio // Default workstation print ''.$langs->trans("DefaultWorkstation").''; 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 ''; } @@ -1643,7 +1643,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio if ($object->duration_value > 0) { print '     '; } - print 'mandatory_period == 1 ? ' checked="checked"' : '').'>'; + print ''; print '