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

Debug feature shown/hide canceled orders

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-18 21:26:35 +01:00
parent c6463c9a83
commit 2afe6ccb4b
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/langs/en_US/main.lang
View File

@ -1158,4 +1158,6 @@ Properties=Properties
hasBeenValidated=%s has been validated
ClientTZ=Client Time Zone (user)
NotClosedYet=Not yet closed
ClearSignature=Signature reset
ClearSignature=Signature reset
CanceledHidden=Canceled hidden
CanceledShown=Canceled shown

2
htdocs/langs/en_US/projects.lang
View File

@ -37,8 +37,6 @@ OpportunitiesStatusForOpenedProjects=Leads amount of open projects by status
OpportunitiesStatusForProjects=Leads amount of projects by status
ShowProject=Show project
ShowTask=Show task
ShowCanceled=Show canceled
HideCanceled=Hide canceled
SetProject=Set project
NoProject=No project defined or owned
NbOfProjects=Number of projects

38
htdocs/projet/element.php
View File

@ -1016,6 +1016,9 @@ foreach ($listofreferent as $key => $value) {
}
}
$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
if (empty($conf->global->PROJECT_LINK_ON_OVERWIEW_DISABLED) && $idtofilterthirdparty && !in_array($tablename, $exclude_select_element)) {
$selectList = $formproject->select_element($tablename, $idtofilterthirdparty, 'minwidth300 minwidth75imp', -2, !empty($project_field) ? $project_field : 'fk_projet');
if ($selectList < 0) {
@ -1046,23 +1049,29 @@ foreach ($listofreferent as $key => $value) {
}
$addform .= '<div>';
}
if ($key == "order_supplier") {
$addform .= '<a id="btnShow" class="buttonxxx marginleftonly" href="#" onClick="return false;">
<span id="textBtnShow" class="valignmiddle text-plus-circle hideonsmartphone">'.$langs->trans("ShowCanceled").'</span><span id="minus-circle" class="fa fa-eye valignmiddle paddingleft" style="padding: 3px 4px 2px 3px"></span>
if (is_array($elementarray) && !count($elementarray) > 0 && $key == "order_supplier") {
$addform = '<div class="inline-block valignmiddle"><a id="btnShow" class="buttonxxx marginleftonly" href="#" onClick="return false;">
<span id="textBtnShow" class="valignmiddle text-plus-circle hideonsmartphone">'.$langs->trans("CanceledShown").'</span><span id="minus-circle" class="fa fa-eye valignmiddle paddingleft"></span>
</a>
<script>
$("#btnShow").on("click", function () {
if($("#tr_canceled").css("display") == "none"){
$("#tr_canceled").show();
$("#textBtnShow").text("'.$langs->trans("HideCanceled").'");
$("#minus-circle").removeClass("fa-eye").addClass("fa-eye-slash");
} else {
$("#tr_canceled").hide();
$("#textBtnShow").text("'.$langs->trans("ShowCanceled").'");
console.log("We click to show or hide the canceled lines");
var attr = $(this).attr("data-canceledarehidden");
if (typeof attr !== "undefined" && attr !== false) {
console.log("Show canceled");
$(".tr_canceled").show();
$("#textBtnShow").text("'.dol_escape_js($langs->trans("CanceledShown")).'");
$("#btnShow").removeAttr("data-canceledarehidden");
$("#minus-circle").removeClass("fa-eye-slash").addClass("fa-eye");
} else {
console.log("Hide canceled");
$(".tr_canceled").hide();
$("#textBtnShow").text("'.dol_escape_js($langs->trans("CanceledHidden")).'");
$("#btnShow").attr("data-canceledarehidden", 1);
$("#minus-circle").removeClass("fa-eye").addClass("fa-eye-slash");
}
});
</script>';
</script></div> '.$addform;
}
print load_fiche_titre($langs->trans($title), $addform, '');
@ -1131,7 +1140,6 @@ foreach ($listofreferent as $key => $value) {
}
print '</tr>';
$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field) ? $project_field : 'fk_projet');
if (is_array($elementarray) && count($elementarray) > 0) {
$total_ht = 0;
$total_ttc = 0;
@ -1186,12 +1194,12 @@ foreach ($listofreferent as $key => $value) {
if (!empty($element->close_code) && $element->close_code == 'replaced') {
$qualifiedfortotal = false; // Replacement invoice, do not include into total
}
} elseif (($key == 'order_supplier') && ($element->status == 7)) {
} elseif ($key == 'order_supplier' && $element->status == 7) {
$qualifiedfortotal = false; // It makes no sense to include canceled orders in the total
}
if (($key == "order_supplier") && ($element->status == 7)) {
print '<tr id ="tr_canceled" class="oddeven" style=display:none>';
if ($key == "order_supplier" && $element->status == 7) {
print '<tr class="oddeven tr_canceled" style=display:none>';
} else {
print '<tr class="oddeven" >';
}