[Noalyss-commit] [noalyss] 26/30: WHen creating from follow-up , keep a link to the event in the operation

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit a501c10054ef740224a60c8ef1b70ab1ac875bf0
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Thu Dec 1 19:06:08 2022 +0100

    WHen creating from follow-up , keep a link to the event in the operation
---
 include/class/acc_ledger_sale.class.php          |   2 +-
 include/compta_ach.inc.php                       |   4 +-
 include/compta_ven.inc.php                       | 255 ++++++++++++-----------
 include/template/acc_ledger-input_extra_info.php |   1 +
 include/template/follow_up_detail_display.php    |   4 +-
 5 files changed, 136 insertions(+), 130 deletions(-)

diff --git a/include/class/acc_ledger_sale.class.php 
b/include/class/acc_ledger_sale.class.php
index 2c658c5f9..6816fdb4b 100644
--- a/include/class/acc_ledger_sale.class.php
+++ b/include/class/acc_ledger_sale.class.php
@@ -1251,7 +1251,7 @@ EOF;
         $r.='<br>';
         $obj = new IText();
         $r.=_('Numero de bon de commande : ') . $obj->input('bon_comm') . 
'<br>';
-        $r.=_('Autre information : ') . $obj->input('other_info') . '<br>';
+        $r.=_('Communication ou autre information  : ') . 
$obj->input('other_info') . '<br>';
         $r.='</p>';
         $r.='</div>';
         return $r;
diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index 73677f8ef..83e645191 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -241,10 +241,12 @@ try
     }
     else if (isset($_GET['create_feenote']))
     {
-        $array=$Ledger->convert_from_follow($http->get('ag_id',"number"));
+        $action_id=$http->get('ag_id',"number");
+        $array=$Ledger->convert_from_follow($action_id);
         echo HtmlInput::hidden("ledger_type", "VEN");
         echo HtmlInput::hidden("ac",$http->get('ac'));
         echo HtmlInput::hidden("sa", "p");
+        echo HtmlInput::hidden("action_gestion",$action_id);
         echo $Ledger->input($array);
         echo '<div class="content">';
         echo 
$Ledger->input_paid($payment,$acompte,$date_payment,$comm_payment);
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index abcce1167..732cd72b2 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -39,159 +39,159 @@ $post_jrn=$http->post("p_jrn", "string","");
 // empty form for encoding
 //----------------------------------------------------------------------
 
-    $Ledger=new Acc_Ledger_Sale($cn,0);
+$Ledger=new Acc_Ledger_Sale($cn,0);
+
+// Check privilege
+if ( isset($_REQUEST['p_jrn']) &&
+        $g_user->check_jrn($http->request("p_jrn","number")) != 'W' )
+{
 
-    // Check privilege
-    if ( isset($_REQUEST['p_jrn']) &&
-            $g_user->check_jrn($http->request("p_jrn","number")) != 'W' )
+    NoAccess();
+    exit -1;
+}
+
+/* if a new invoice is encoded, we display a form for confirmation */
+if ( isset ($_POST['view_invoice'] ) )
+{
+    $p_jrn=$http->post("p_jrn","number");
+    $Ledger=new Acc_Ledger_Sale($cn,$p_jrn);
+    try
+    {
+        $Ledger->verify_operation($_POST);
+    }
+    catch (Exception $e)
+    {
+        alert($e->getMessage());
+        $p_msg=$e->getMessage();
+        $correct=1;
+    }
+    // if correct is not set it means it is correct
+    if ( ! isset($correct))
+    {
+        echo '<div class="content">';
+
+        echo '<div id="confirm_div_id" style="width: 47%; float: left;">';
+        echo h1(_("Confirmation"));
+        echo span(_("Vous devez encore confirmer"),' class="notice"');
+        echo '</div>';
+
+        echo '<div id="confirm_div_id" style="width: 100%; float: left;">';
+        echo '<form class="print" enctype="multipart/form-data" 
method="post">';
+        echo dossier::hidden();
+        echo $Ledger->confirm($_POST );
+        echo HtmlInput::hidden('ac',$strac);
+        $Ledger->input_extra_info();
+        echo HtmlInput::submit("record", _("Enregistrement"), 'onClick="return 
verify_ca(\'\');"');
+        echo HtmlInput::submit('correct', _("Corriger"));
+        echo '</form>';
+        echo '</div>';
+        if (DEBUGNOALYSS>1) { echo "<!-- confirm_div_id -->";}
+        return;
+    }
+}
+//------------------------------
+/* Record the invoice */
+//------------------------------
+
+if ( isset($_POST['record']) )
+{
+// Check privilege
+    if ( $g_user->check_jrn($post_jrn) != 'W' )
     {
 
         NoAccess();
         exit -1;
     }
 
-    /* if a new invoice is encoded, we display a form for confirmation */
-    if ( isset ($_POST['view_invoice'] ) )
+    $Ledger=new Acc_Ledger_Sale($cn,$post_jrn);
+    try
     {
-        $p_jrn=$http->post("p_jrn","number");
-        $Ledger=new Acc_Ledger_Sale($cn,$p_jrn);
-        try
-        {
-            $Ledger->verify_operation($_POST);
-        }
-        catch (Exception $e)
-        {
-            alert($e->getMessage());
-            $p_msg=$e->getMessage();
-            $correct=1;
-        }
-        // if correct is not set it means it is correct
-        if ( ! isset($correct))
-        {
-            echo '<div class="content">';
-
-            echo '<div id="confirm_div_id" style="width: 47%; float: left;">';
-            echo h1(_("Confirmation"));
-            echo span(_("Vous devez encore confirmer"),' class="notice"');
-            echo '</div>';
-            
-            echo '<div id="confirm_div_id" style="width: 100%; float: left;">';
-            echo '<form class="print" enctype="multipart/form-data" 
method="post">';
-            echo dossier::hidden();
-            echo $Ledger->confirm($_POST );
-            echo HtmlInput::hidden('ac',$strac);
-            $Ledger->input_extra_info();
-            echo HtmlInput::submit("record", _("Enregistrement"), 
'onClick="return verify_ca(\'\');"');
-            echo HtmlInput::submit('correct', _("Corriger"));
-            echo '</form>';
-            echo '</div>';
-            if (DEBUGNOALYSS>1) { echo "<!-- confirm_div_id -->";}
-            return;
-        }
+        $Ledger->verify_operation($_POST);
+    }
+    catch (Exception $e)
+    {
+        alert($e->getMessage());
+        $correct=1;
     }
-    //------------------------------
-    /* Record the invoice */
-    //------------------------------
 
-    if ( isset($_POST['record']) )
+    if ( ! isset($correct))
     {
-// Check privilege
-        if ( $g_user->check_jrn($post_jrn) != 'W' )
-        {
+        if ( is_msie() == 0 )
+            echo '<div style="position:absolute"  class="content">';
+         else
+            echo '<div class="content">';
 
-            NoAccess();
-            exit -1;
-        }
+        $Ledger=new Acc_Ledger_Sale($cn,$_POST['p_jrn']);
+        $internal=$Ledger->insert($_POST);
 
-        $Ledger=new Acc_Ledger_Sale($cn,$post_jrn);
-        try
-        {
-            $Ledger->verify_operation($_POST);
-        }
-        catch (Exception $e)
+        /* Save the predefined operation */
+        if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) != "" )
         {
-            alert($e->getMessage());
-            $correct=1;
+            $opd=new Pre_operation($cn);
+            $opd->get_post();
+            $opd->save();
         }
 
-        if ( ! isset($correct))
-        {
-            if ( is_msie() == 0 ) 
-                echo '<div style="position:absolute"  class="content">';
-             else
-                echo '<div class="content">';
-
-            $Ledger=new Acc_Ledger_Sale($cn,$_POST['p_jrn']);
-            $internal=$Ledger->insert($_POST);
+        /* Show button  */
+        echo '<h1> Enregistrement </h1>';
 
-            /* Save the predefined operation */
-            if ( isset($_POST['opd_name']) && trim($_POST['opd_name']) != "" )
-            {
-                $opd=new Pre_operation($cn);
-                $opd->get_post();
-                $opd->save();
-            }
+        echo $Ledger->confirm($_POST,true);
+        /* Show link for Invoice */
+        if (isset ($Ledger->doc) )
+        {
+            echo '<h2>'._('Document').' </h2>';
+            echo $Ledger->doc;
+        }
 
-            /* Show button  */
-            echo '<h1> Enregistrement </h1>';
 
-            echo $Ledger->confirm($_POST,true);
-            /* Show link for Invoice */
-            if (isset ($Ledger->doc) )
-            {
-                echo '<h2>'._('Document').' </h2>';
-                echo $Ledger->doc;
-            }
+        /* Save the additional information into jrn_info */
+        $obj=new Acc_Ledger_Info($cn);
+        $obj->save_extra($Ledger->jr_id,$_POST);
 
+         /* save followup */
+         $Ledger->save_followup($http->request("action_gestion","string",""));
 
-            /* Save the additional information into jrn_info */
-            $obj=new Acc_Ledger_Info($cn);
-            $obj->save_extra($Ledger->jr_id,$_POST);
-            
-             /* save followup */
-             
$Ledger->save_followup($http->request("action_gestion","string",""));
-             
-             // extourne
-            if (isset($_POST['reverse_ck']))
+         // extourne
+        if (isset($_POST['reverse_ck']))
+        {
+            $p_date=$http->post('reverse_date', "string",'');
+            $p_msg=$http->post("ext_label");
+            if (isDate($p_date)==$p_date)
             {
-                $p_date=$http->post('reverse_date', "string",'');
-                $p_msg=$http->post("ext_label");
-                if (isDate($p_date)==$p_date)
+                // reverse the operation
+                try
                 {
-                    // reverse the operation
-                    try
-                    {
-                        $Ledger->reverse($p_date,$p_msg);
-                        echo '<p>';
-                        echo _('Extourné au ').$p_date;
-                        echo '</p>';
-
-                    }
-                    catch (Exception $e)
-                    {
-                        echo '<span class="warning">'._('Opération non 
extournée').
-                            $e->getMessage().
-                            '</span>';
-                    }
+                    $Ledger->reverse($p_date,$p_msg);
+                    echo '<p>';
+                    echo _('Extourné au ').$p_date;
+                    echo '</p>';
+
                 }
-                else
+                catch (Exception $e)
                 {
-                    // warning because date is invalid
-                    echo '<span class="warning">'._('Date invalide, opération 
non extournée').'</span>';
+                    echo '<span class="warning">'._('Opération non extournée').
+                        $e->getMessage().
+                        '</span>';
                 }
             }
-            echo '<ul class="aligned-block">';
-            echo "<li>";
-            echo $Ledger->button_new_operation();
-            echo "</li>";
-            echo "<li>";
-            echo $Ledger->button_copy_operation();
-            echo "</li>"; 
-            echo "</ul>";
-            echo '</div>';
-            return;
+            else
+            {
+                // warning because date is invalid
+                echo '<span class="warning">'._('Date invalide, opération non 
extournée').'</span>';
+            }
         }
+        echo '<ul class="aligned-block">';
+        echo "<li>";
+        echo $Ledger->button_new_operation();
+        echo "</li>";
+        echo "<li>";
+        echo $Ledger->button_copy_operation();
+        echo "</li>";
+        echo "</ul>";
+        echo '</div>';
+        return;
     }
+}
 //  ------------------------------
 /* Display a blank form or a form with predef operation */
 //  ------------------------------
@@ -255,10 +255,12 @@ try
     }
     else if (isset($_GET['create_invoice']))
     {
-        $array=$Ledger->convert_from_follow($http->get('ag_id',"number"));
+        $action_id=$http->get('ag_id',"number");
+        $array=$Ledger->convert_from_follow($action_id);
         echo HtmlInput::hidden("ledger_type", "VEN");
         echo HtmlInput::hidden("ac", $http->get('ac'));
         echo HtmlInput::hidden("sa", "p");
+        echo HtmlInput::hidden("action_gestion",$action_id);
         echo $Ledger->input($array);
         echo '<div class="content">';
         echo 
$Ledger->input_paid($payment,$acompte,$date_payment,$comm_payment);
@@ -272,7 +274,8 @@ try
         echo HtmlInput::hidden("ledger_type", "VEN");
         echo HtmlInput::hidden("ac", $strac);
         echo HtmlInput::hidden("sa", "p");
-
+        $action_id=$http->get('ag_id',"number");
+        echo HtmlInput::hidden("action_gestion",$action_id);
         echo $Ledger->input($array);
         echo '<div class="content">';
         echo 
$Ledger->input_paid($payment,$acompte,$date_payment,$comm_payment);
diff --git a/include/template/acc_ledger-input_extra_info.php 
b/include/template/acc_ledger-input_extra_info.php
index 9cd54d33d..0054e482b 100644
--- a/include/template/acc_ledger-input_extra_info.php
+++ b/include/template/acc_ledger-input_extra_info.php
@@ -144,6 +144,7 @@ if ( in_array("document",$a_show)) {
     Action gestion
         <?php
             $irelated_action=new IRelated_Action("action_gestion");
+            
$irelated_action->value=$http->request("action_gestion","string","");
             echo $irelated_action->input();
         ?>
 </div>
diff --git a/include/template/follow_up_detail_display.php 
b/include/template/follow_up_detail_display.php
index f05ebe47e..481057c9d 100644
--- a/include/template/follow_up_detail_display.php
+++ b/include/template/follow_up_detail_display.php
@@ -199,7 +199,7 @@ $menu=new Default_Menu();
     <?php
     if (Document_Option::is_enable_make_invoice($p_follow_up->dt_id)):
         ?>
-        <div id="follow_up_detail_invoice" class="col m-3">
+        <div id="follow_up_detail_invoice" class="col m-3" 
style="position:static">
             <?php
             $query=http_build_query(array('gDossier'=>Dossier::id(), 
'ag_id'=>$p_follow_up->ag_id, 'create_invoice'=>1, 
'ac'=>$menu->get('code_invoice')));
             echo HtmlInput::button_anchor(_("Transformer en Facture de 
Vente"), "do.php?".$query, "create_invoice",
@@ -213,7 +213,7 @@ $menu=new Default_Menu();
     <?php
     if (Document_Option::is_enable_make_feenote($p_follow_up->dt_id)):
         ?>
-        <div id="follow_up_detail_feenote" class="col m-3">
+        <div id="follow_up_detail_feenote" class="col m-3" 
style="position:static">
             <?php
             $query=http_build_query(array('gDossier'=>Dossier::id(), 
'ag_id'=>$p_follow_up->ag_id, 'create_feenote'=>1, 
'ac'=>$menu->get('code_feenote')));
             echo HtmlInput::button_anchor(_("Transformer en Note de frais ou 
Facture Achat"), "do.php?".$query, "create_feenote",