[Noalyss-commit] [noalyss] 35/38: Merge devel

[dwm]

sparkyx pushed a commit to branch devel
in repository noalyss.

commit 83352b2e6ef3c73120e7c3e608668ace030ee991
Merge: 4c43d4882 6f859d6ef
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Sun Feb 18 13:04:31 2024 +0100

    Merge devel
    
     Conflicts:
            html/ajax_misc.php
            include/ajax/ajax_card.php
            include/ajax/ajax_follow_up.php
            include/class/acc_ledger.class.php
            sql/upgrade.sql

 html/ajax_misc.php                                 |   4 +
 html/image/logo9000.png                            | Bin 33156 -> 33905 bytes
 html/js/gestion.js                                 |  62 ++++++++++++++
 include/action.common.inc.php                      |  10 +++
 include/ajax/ajax_card.php                         |   6 ++
 include/ajax/ajax_follow_up.php                    |  18 +++-
 include/class/acc_ledger_purchase.class.php        |   4 +-
 include/class/acc_ledger_sale.class.php            |   9 +-
 include/class/card_pdf.class.php                   |  71 +++++++++++++++
 include/class/follow_up_filter.class.php           |  95 +++++++++++++++++++++
 include/export/export_card_pdf.php                 |  16 ++++
 include/lib/ac_common.php                          |  26 ++++++
 include/lib/select_box.class.php                   |   2 +-
 include/template/action_search.php                 |  66 ++++++++------
 include/template/follow_up_filter-display_list.php |  86 +++++++++++++++++++
 sql/reverse.sql                                    |  10 +++
 sql/upgrade.sql                                    |   5 ++
 17 files changed, 454 insertions(+), 36 deletions(-)

diff --cc html/ajax_misc.php
index e3d97138d,6879065ca..5e1261b5b
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@@ -344,8 -344,10 +344,12 @@@ $path = array
      "operation_exercice+text"=>"ajax_operation_exercice",
      // transfer operation to accountancy
      'operation_exercice+transfer'=>"ajax_operation_exercice",
 +    // view list of followup for a card
 +    "view_followup_card"=>"ajax_follow_up",
+     //list filter for followup
+     'list_filter_followup'=>"ajax_follow_up",
+     //delete a filter for followup
+     'delete_filter_followup'=>"ajax_follow_up",
  ) ;
  
  if (array_key_exists($op, $path)) {
diff --cc include/ajax/ajax_card.php
index 267872812,f354f4f33..d534a6b39
--- a/include/ajax/ajax_card.php
+++ b/include/ajax/ajax_card.php
@@@ -168,7 -168,12 +168,13 @@@ case 'dc'
                $html.=HtmlInput::submit('save',_('Sauver'));
              }
            if ( ! isset 
($nohistory))$html.=HtmlInput::history_card_button($f->id,_('Historique'));
 +          if ( ! isset 
($nofollowup))$html.=HtmlInput::followup_card_button($f->id,_('Suivi'));
+         
$button_pdf=HtmlInput::button_anchor(_("PDF"),"export.php?".http_build_query([
+                 "act"=>"PDF:card",
+                 "card_id"=>$f->id,
+                 "gDossier"=>Dossier::id()
+             ]));
+         $html.=$button_pdf;
              // Display a remove button if not used and can modify card
              if ( $can_modify == 1 && $f->is_used()==FALSE)
              {
diff --cc include/ajax/ajax_follow_up.php
index 51c416e9d,f5a0e5028..b5554c410
--- a/include/ajax/ajax_follow_up.php
+++ b/include/ajax/ajax_follow_up.php
@@@ -140,18 -139,17 +140,32 @@@ if ($op == 'followup_comment_oneedit') 
      }
      return;
  }
 +
 +/**************************************************************************
-  * See list of follow-up evebt
++ * See list of follow-up event
 + *************************************************************************/
 +if ($op =="view_followup_card")
 +{
 +    $div=$http->get("div");
 +    $card=new Fiche($cn,$http->get("f_id","number"));
 +    echo HtmlInput::title_box("Suivi 
".h($card->strAttribut(ATTR_DEF_NAME)),$div);
 +    
$query=Follow_Up::create_query($cn,["qcode"=>$card->strAttribut(ATTR_DEF_QUICKCODE)]);
 +    $followup=new Follow_Up($cn);
 +    echo $followup->view_list($query);
 +    echo \HtmlInput::button_close($div);
 +    return;
- }
++}
+ 
/********************************************************************************************************************
+  *  list the existing filter for followup
+  
******************************************************************************************************************/
+ if ( $op == 'list_filter_followup') {
+     $followup_filter=Follow_Up_Filter::display_list($g_user->getLogin());
+     return;
+ }
+ 
/*******************************************************************************************************************
+  * delete_filter_followup(p_dossier,filter_id)
+  
*******************************************************************************************************************/
+ if ( $op == 'delete_filter_followup') {
+     $cn->exec_delete("delete from action_gestion_id where af_id=$1 and 
af_user=$2",
+     [$http->get("filter_id","number"),$g_user->getLogin()]);
 -}
++}
diff --cc sql/reverse.sql
index 000000000,000000000..bd4c93f72
new file mode 100644
--- /dev/null
+++ b/sql/reverse.sql
@@@ -1,0 -1,0 +1,10 @@@
++drop trigger t_remove_script_tag on public.action_gestion_comment ;
++drop FUNCTION comptaproc.trg_remove_script_tag();
++
++
++delete from profile_menu where me_code='PDF:card';
++delete from public.menu_ref where me_code='PDF:card';
++
++
++
++drop table action_gestion_filter;