noalyss-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Noalyss-commit] [noalyss] 54/323: Task #1326 & #1512 = ajout détail ex


From: Dany De Bontridder
Subject: [Noalyss-commit] [noalyss] 54/323: Task #1326 & #1512 = ajout détail extourne, libellé directement après ajout opération
Date: Wed, 14 Mar 2018 17:38:17 -0400 (EDT)

sparkyx pushed a commit to branch master
in repository noalyss.

commit 08c5d6e501ad50414bc41771dade4ab8d30a3225
Author: Dany De Bontridder <address@hidden>
Date:   Thu Jan 11 18:36:50 2018 +0100

    Task #1326 & #1512 = ajout détail extourne, libellé directement après ajout 
opération
---
 include/class/acc_ledger.class.php    | 4 ++--
 include/compta_ach.inc.php            | 9 +++++++--
 include/compta_ods.inc.php            | 3 ++-
 include/compta_ven.inc.php            | 7 ++++++-
 include/operation_ods_confirm.inc.php | 7 +++++--
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/include/class/acc_ledger.class.php 
b/include/class/acc_ledger.class.php
index 25e95cc..93c3140 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -306,11 +306,11 @@ class Acc_Ledger extends jrn_def_sql
               jr_date,
               jr_grpt_id,
               jr_internal
-              ,jr_tech_per, jr_valid
+              ,jr_tech_per, jr_valid,jr_optype
               )
               select $1,jr_def_id,jr_montant,$7,
               to_date($2,'DD.MM.YYYY'),$3,$4,
-              $5, true
+              $5, true,'EXT'
               from
               jrn
               where   jr_id=$6";
diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index ef6f46f..c44e185 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -105,6 +105,10 @@ if (isset($_POST['view_invoice']))
                 $reverse_ck=new ICheckBox('reverse_ck');
                 echo _('Extourne opération')." ".$reverse_ck->input()." ";
                 echo $reverse_date->input();
+                $msg_reverse=new IText("ext_label");
+                $msg_reverse->placeholder=_("Message extourne");
+                $msg_reverse->size=60;
+                echo _("Message")." ".$msg_reverse->input();
                 echo '</div>';
                 
                  echo HtmlInput::submit("record", _("Enregistrement"), 
'onClick="return verify_ca(\'\');"');
@@ -175,13 +179,14 @@ if (isset($_POST['record']))
                 // extourne
                 if (isset($_POST['reverse_ck']))
                 {
-                    $p_date=$htt->post('reverse_date','string', '');
+                    $p_date=$http->post('reverse_date','string', '');
+                    $p_msg=$http->post("ext_label");
                     if (isDate($p_date)==$p_date)
                     {
                         // reverse the operation
                         try
                         {
-                            $Ledger->reverse($p_date);
+                            $Ledger->reverse($p_date,$p_msg);
                             echo '<p>';
                             printf ( _('Extourné au %s'),$p_date);
                             echo '</p>';
diff --git a/include/compta_ods.inc.php b/include/compta_ods.inc.php
index 08d75cd..cab936d 100644
--- a/include/compta_ods.inc.php
+++ b/include/compta_ods.inc.php
@@ -105,12 +105,13 @@ elseif (isset($_POST['save']))
                 if (isset($_POST['reverse_ck']))
                 {
                     $p_date=$http->post('reverse_date',"string", '');
+                    $p_msg=$http->post("ext_label");
                     if (isDate($p_date)==$p_date)
                     {
                         // reverse the operation
                         try
                         {
-                            $ledger->reverse($p_date);
+                            $ledger->reverse($p_date,$p_msg);
                             echo '<p>';
                             echo _('Extourné au ').$p_date;
                             echo '</p>';
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index eb6872f..dbde101 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -112,6 +112,10 @@ $p_msg="";
             $reverse_ck=new ICheckBox('reverse_ck');
             echo _('Extourne opération')." ".$reverse_ck->input()." ";
             echo $reverse_date->input();
+            $msg_reverse=new IText("ext_label");
+            $msg_reverse->placeholder=_("Message extourne");
+            $msg_reverse->size=60;
+            echo _("Message")." ".$msg_reverse->input();
             echo '</div>';
             
            echo HtmlInput::hidden('ac',$_REQUEST['ac']);
@@ -193,12 +197,13 @@ show_tab(a_tab,'facturation_div_id');
             if (isset($_POST['reverse_ck']))
             {
                 $p_date=$http->post('reverse_date', "string",'');
+                $p_msg=$http->post("ext_label");
                 if (isDate($p_date)==$p_date)
                 {
                     // reverse the operation
                     try
                     {
-                        $Ledger->reverse($p_date);
+                        $Ledger->reverse($p_date,$p_msg);
                         echo '<p>';
                         echo _('Extourné au ').$p_date;
                         echo '</p>';
diff --git a/include/operation_ods_confirm.inc.php 
b/include/operation_ods_confirm.inc.php
index 8bb510c..8007ef4 100644
--- a/include/operation_ods_confirm.inc.php
+++ b/include/operation_ods_confirm.inc.php
@@ -58,10 +58,14 @@ echo $ledger->confirm($_POST,false);
     </div>
     <div id="reverse_div_id" style="display:none;height:185px;height:10rem">
     <?php
-        $reverse_date=new IDate('reverse_date');
         $reverse_ck=new ICheckBox('reverse_ck');
         echo _('Extourne opération')." ".$reverse_ck->input()." ";
+        $reverse_date=new IDate('reverse_date');
         echo $reverse_date->input();
+        $msg_reverse=new IText("ext_label");
+        $msg_reverse->size=60;
+        $msg_reverse->placeholder=_("Message extourne");
+        echo _("Message")." ".$msg_reverse->input();
     ?>
     </div>
     <div id="document_div_id" style="display:none;height:185px;height:10rem">
@@ -77,7 +81,6 @@ echo $ledger->confirm($_POST,false);
     <div id="operationtype_div_id" 
style="display:none;height:185px;height:10rem">
         <?php
             $status=$http->request("jr_optype","string","NOR");
-            echo $_POST['jr_optype'];
             echo Acc_Operation::select_operation_type($status)->input();
         ?>
     </div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]