[Noalyss-commit] [noalyss] 52/173: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, add action CSV:Analytic_Axis

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit d78acab7a735a1d3447267398421d10ed7672523
Author: Dany De Bontridder <dany@alchimerys.be>
AuthorDate: Fri Jan 25 21:33:41 2019 +0100

    Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique,
    add action CSV:Analytic_Axis
    
    (cherry picked from commit 0d0ce3647f170a22463b1639efa15ab767336c95)
---
 include/anc_pa.inc.php           | 31 +++++++++++++------------------
 include/constant.php             |  2 +-
 include/sql/patch/upgrade132.sql |  2 +-
 include/sql/patch/upgrade133.sql | 13 +++++++++++++
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/include/anc_pa.inc.php b/include/anc_pa.inc.php
index a5461e0..a795c35 100644
--- a/include/anc_pa.inc.php
+++ b/include/anc_pa.inc.php
@@ -83,24 +83,13 @@ if ($sa=="pa_write")
     else
     {
         $new=new Anc_Plan($cn);
-        $new->name=$_POST['pa_name'];
-        $new->description=$_POST['pa_description'];
+        $new->name=$http->post("pa_name");
+        $new->description=$http->post("pa_description");
         $new->add();
     }
     $sa="anc_menu";
 }
 
-// Update the PA
-if ($sa=="pa_update")
-{
-    $pa_id=$http->get("pa_id","number");
-
-    $new=new Anc_Plan($cn, $pa_id);
-    $new->name=$_POST['pa_name'];
-    $new->description=$_POST['pa_description'];
-    $new->update();
-    $sa="anc_menu";
-}
 
 /* delete pa */
 if ($sa=="pa_delete")
@@ -120,19 +109,25 @@ if ($sa=="pa_detail")
     $pa_id=$http->get("pa_id","number");
     
     $new=new Anc_Plan($cn, $pa_id);
-    $wSa=HtmlInput::hidden("sa", "pa_update");
 
     $new->get();
 
     $ret.= '<div class="content">';
 
     $ret.= $new->form();
-    $ret.= $wSa;
-    $ret.="<p>";
+    // Export in CSV
+    $ret.='<form method="GET" action="export.php" style="display:inline">';
+    $ret.=Dossier::hidden();
+    $ret.=HtmlInput::hidden("act",'CSV:Analytic_Axis');
+    $ret.=HtmlInput::hidden("pa_id",$pa_id);
+    $ret.=HtmlInput::submit('export_analytic_axis',_("Export CSV"));
+    $ret.='</form>';
     $ret.=HtmlInput::button_anchor(_('Efface ce plan'), '', 
'remove_analytic_plan',
                     'onclick="return 
confirm_box(\'remove_analytic_plan\',\'Effacer ?\',function () 
{window.location=\'do.php?ac='.$_REQUEST['ac'].'&pa_id='.$_GET['pa_id'].'&sa=pa_delete&'.$str_dossier.'\';})"',
                     'smallbutton');
-    $ret.="</p>";
+
+    $ret.='</div>';
+
     //---------------------------------------------------------------------
     //  Detail now
     // Use Manage_Table
@@ -141,7 +136,7 @@ if ($sa=="pa_detail")
 
     $new=new Anc_Plan($cn, $pa_id);
     $new->get();
-    $ret.='<div class="content">';
+    $ret.='<div class="content" style="margin-top:1rem">';
     $anc=new Poste_analytique_SQL($cn);
     $anc->pa_id=$pa_id;
     $accounting=new Anc_Account_Table($anc);
diff --git a/include/constant.php b/include/constant.php
index c6bea47..78762ee 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -108,7 +108,7 @@ if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
 if ( ! defined ("SYSINFO_DISPLAY")) {
     define ("SYSINFO_DISPLAY",TRUE);
 }
-define ("DBVERSION",133);
+define ("DBVERSION",134);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",18);
 define ('NOTFOUND','--not found--');
diff --git a/include/sql/patch/upgrade132.sql b/include/sql/patch/upgrade132.sql
index 4565200..255c7a2 100644
--- a/include/sql/patch/upgrade132.sql
+++ b/include/sql/patch/upgrade132.sql
@@ -10,6 +10,6 @@ operation_currency
 join jrnx using (j_id)
 group by f_id,j_id;
 
-commit ;
+
 insert into version (val,v_description) values (133,'Currency : default 
accounting for currency difference  ');
 commit ;
\ No newline at end of file
diff --git a/include/sql/patch/upgrade133.sql b/include/sql/patch/upgrade133.sql
new file mode 100644
index 0000000..fc756c6
--- /dev/null
+++ b/include/sql/patch/upgrade133.sql
@@ -0,0 +1,13 @@
+begin;
+
+INSERT INTO public.menu_ref
+(me_code, me_menu, me_file, me_url, me_description, me_parameter, 
me_javascript, me_type, me_description_etendue)
+VALUES('CSV:Analytic_Axis', 'Export ANC', 'export_anc_axis_csv.php', NULL, 
'Export ANC Liste comptes', NULL, NULL, 'PR', NULL);
+
+
+insert into profile_menu (me_code,p_id,p_type_display) select   distinct   
'CSV:Analytic_Axis',  p_id,  'P' from profile_menu
+where
+    p_id in (select distinct p_id from profile_menu where me_code='PLANANC');
+
+insert into version (val,v_description) values (134,'Export 
CSV:Analytic_Axis');
+commit ;
\ No newline at end of file