Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3762d98
Add expedition to massaction order to invoice
Jan 4, 2024
75f1b62
Merge branch '3.22' of https://github.com/ATM-Consulting/dolibarr_mod…
Jan 4, 2024
6fccf4f
Merge branch '3.22_new_exp_in_massaction' into main
Jan 4, 2024
bec9600
Merge branch 'main' of https://github.com/ATM-Consulting/dolibarr_mod…
Jul 2, 2024
e11d575
Merge branch 'main' of https://github.com/ATM-Consulting/dolibarr_mod…
Aug 27, 2024
161a6e1
Merge branch 'main' of https://github.com/ATM-Consulting/dolibarr_mod…
Sep 4, 2024
7339715
NEW : mass action option for expeditions
Sep 4, 2024
30dcb28
remove cp fail
Sep 4, 2024
9961ab5
Update langs
Sep 4, 2024
97bc203
changelog
Sep 4, 2024
ffcf0ad
fix font awesome
Sep 4, 2024
028270f
ll
Sep 16, 2024
aaad0af
Merge branch 'fix_v20_compatibility_nc_col' of github.com:THERSANE/do…
Sep 16, 2024
1714f3c
remove duplicate setup
Sep 16, 2024
0828bab
Fix
Sep 16, 2024
1914602
NEW : Use v20 dropdown for action buttons & fix buttons orders
Oct 1, 2024
71a6afc
changelog
Oct 1, 2024
32f96d6
Changement suite à modifications de eldy
Oct 4, 2024
6b7f64c
Update langs/es_ES/subtotal.lang
thersane-john Nov 27, 2024
d3276df
Update langs/en_US/subtotal.lang
thersane-john Nov 27, 2024
ab0733a
Update langs/es_ES/subtotal.lang
thersane-john Nov 27, 2024
34a923e
Update langs/fr_FR/subtotal.lang
thersane-john Nov 27, 2024
5839ff9
Update langs/es_ES/subtotal.lang
thersane-john Nov 27, 2024
3016006
Update langs/fr_FR/subtotal.lang
thersane-john Nov 27, 2024
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
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.

# Release 3.25 - 24/07/2024

- FIX : Compat V20 : Document col missing for title for NC - *16/09/2024* - 3.25.4
- FIX DA025399 : GETPOST type integer n'existe pas - *22/08/2024* - 3.25.3
- FIX : CKeditor no check version to avoid the error message - *20/08/2024* - 3.25.2
- FIX : Title summary - *24/07/2024* - 3.25.1
Expand Down
2 changes: 2 additions & 0 deletions admin/subtotal_setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@
// Autoriser l'ajout d'un titre et sous-total
$formSetup->newItem('SUBTOTAL_ALLOW_ADD_BLOCK')->setAsYesNo();

$formSetup->newItem('SUBTOTAL_ALLOW_ADD_BLOCK')->setAsYesNo();

// Autoriser la suppression d'un titre ou sous-total
$formSetup->newItem('SUBTOTAL_ALLOW_EDIT_BLOCK')->setAsYesNo();

Expand Down
9 changes: 7 additions & 2 deletions class/actions_subtotal.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -3785,12 +3785,17 @@ function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager) {

if ((typeof id != 'undefined' && id.indexOf('row-') == 0) || $(item).hasClass('liste_titre'))
{
$(item).children('td:last-child').before('<td class="subtotal_nc"></td>');
let tableNCColSelector = 'td';
if($(item).hasClass('liste_titre') && $(item).children('th:last-child').length > 0 && $(item).children('td:last-child').length == 0){
tableNCColSelector = 'th'; // In Dolibarr V20.0 title use th instead of td
}

$(item).children(`${tableNCColSelector}:last-child`).before(`<${tableNCColSelector} class="subtotal_nc"></${tableNCColSelector}>`);

if ($(item).attr('rel') != 'subtotal' && typeof $(item).attr('id') != 'undefined')
{
var idSplit = $(item).attr('id').split('-');
$(item).children('td.subtotal_nc').append($('<input type="checkbox" id="subtotal_nc-'+idSplit[1]+'" class="subtotal_nc_chkbx" data-lineid="'+idSplit[1]+'" value="1" '+(typeof subtotal_TSubNc[idSplit[1]] != 'undefined' && subtotal_TSubNc[idSplit[1]] == 1 ? 'checked="checked"' : '')+' />'));
$(item).children(`${tableNCColSelector}.subtotal_nc`).append($('<input type="checkbox" id="subtotal_nc-'+idSplit[1]+'" class="subtotal_nc_chkbx" data-lineid="'+idSplit[1]+'" value="1" '+(typeof subtotal_TSubNc[idSplit[1]] != 'undefined' && subtotal_TSubNc[idSplit[1]] == 1 ? 'checked="checked"' : '')+' />'));
}
}
else
Expand Down