[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 06/38: Task #2219 Suivi Cosmétique et PHP8.1
From: |
dwm |
Subject: |
[Noalyss-commit] [noalyss] 06/38: Task #2219 Suivi Cosmétique et PHP8.1 Compatibility |
Date: |
Sun, 18 Feb 2024 07:30:42 -0500 (EST) |
sparkyx pushed a commit to branch devel
in repository noalyss.
commit 4da519b10225570b6a91a55e6c17af1a44b7d92f
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Wed Jan 31 07:39:24 2024 +0100
Task #2219 Suivi Cosmétique et PHP8.1 Compatibility
---
include/template/follow_up-display.php | 28 +++++++++++++++++++++++-----
include/template/ledger_detail_misc.php | 2 +-
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/include/template/follow_up-display.php
b/include/template/follow_up-display.php
index 1c64f9fae..f3851b047 100644
--- a/include/template/follow_up-display.php
+++ b/include/template/follow_up-display.php
@@ -8,7 +8,7 @@ $uniq=uniqid("tab",TRUE);
<?php
\Noalyss\Dbg::echo_file(__FILE__);
?>
-<div class="row">
+<div class="row m-0">
<div class="col">
<table>
@@ -48,12 +48,18 @@ $uniq=uniqid("tab",TRUE);
<?php echo $w->search().$w->input();
?>
</td>
+ </tr>
+ <tr class="font-weight-bolder" style="background:
lightsteelblue;color:navy">
+ <td style="width: auto" colspan="2" >
+ <?=$sp->input()?>
+ </td>
</Tr>
<tr>
<TD>
<?php echo _('Contact')?>
</TD>
- <TD>
+
+ <TD>
<?php
if ($g_user->can_write_action($this->ag_id) == true ):
if ( $ag_contact->extra != "" ):
@@ -65,7 +71,15 @@ $uniq=uniqid("tab",TRUE);
?>
</td>
- </Tr>
+ </tr>
+ <tr class="font-weight-bolder" style="background:
lightsteelblue;color:navy;opacity: 0.8">
+ <td style="width: auto" colspan="2">
+ <?php //nom autre contact
+ echo $spcontact->input();
+ ?>
+ </td>
+
+ </Tr>
<?php
//----------------------- Video Conf
--------------------------------------------------------------------------------
if (Document_Option::is_enable_video_conf($this->dt_id)):?>
@@ -492,8 +506,8 @@ if ( $this->ag_id > 0 &&
Document_Option::is_enable_operation_detail($this->dt_i
</span>
</div>
<?php endif;?>
-
+<?php if (($p_view != 'READ' && $str_select_doc != '' )|| ! empty
($aAttachedFile)) : ?>
<div id="div_action_attached_doc">
<h2>
<?php echo _('Pièces attachées')?>
@@ -519,6 +533,9 @@ endif; ?>
**********************************************************************************************************************/
?>
</div>
+ <?php
+ if ( ! empty ($aAttachedFile)) :
+ ?>
<div id="icon_show_file_div_id<?=$uniq?>">
<?php
/** Start Block Document **/
@@ -578,7 +595,7 @@ endfor;
</div>
<div>
-<?php if ( ! empty ($aAttachedFile)) :
+<?php
/*** Propose to download all document in only one step */
$url="export.php?".http_build_query([
'ac'=>"FOLLOW",
@@ -609,6 +626,7 @@ catch(exception) { alert('<?php echo j(_('Je ne peux pas
ajouter de fichier'))?>
</script>
</div>
+<?php endif;?>
<?php if ($p_view != 'NEW') : ?>
Document créé le <?php echo $this->ag_timestamp ?> par <?php echo
$this->ag_owner?>
<?php endif; ?>
diff --git a/include/template/ledger_detail_misc.php
b/include/template/ledger_detail_misc.php
index c0c63d6be..0655bf92c 100644
--- a/include/template/ledger_detail_misc.php
+++ b/include/template/ledger_detail_misc.php
@@ -54,7 +54,7 @@ require_once NOALYSS_TEMPLATE.'/ledger_detail_top.php';
<td>
<?php
$itext=new IText('npj');
- $itext->value=strip_tags($obj->det->jr_pj_number);
+ $itext->value=strip_tags($obj->det->jr_pj_number??"");
echo td(_('Pièce')).td($itext->input());
?>
</td>
- [Noalyss-commit] [noalyss] branch devel updated (23653dddb -> 910ae8b9f), dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 06/38: Task #2219 Suivi Cosmétique et PHP8.1 Compatibility,
dwm <=
- [Noalyss-commit] [noalyss] 01/38: Cosmetic : Alignement, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 15/38: bug follow-up, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 12/38: Task #02326: Suivi : possibilité de charger plusieurs documents, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 04/38: Tableau de bord : position des détail, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 02/38: Correction : prevent direct access to $_REQUEST, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 03/38: version 9.2, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 08/38: Task #2128 : Comptabilité française : report, montre le solde de l'année et depuis le début pour les fiches, postes en HTML et PDF, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 05/38: SUIVI : détail , montre nom et prénom, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 19/38: version 9.2, dwm, 2024/02/18
- [Noalyss-commit] [noalyss] 33/38: CARD : add button to epxort to PDF, dwm, 2024/02/18