[Phpcompta-dev] r4971 - in phpcompta/trunk: include sql

[phpcompta-dev]

Author: danydb
Date: 2012-06-21 19:13:37 +0200 (Thu, 21 Jun 2012)
New Revision: 4971

Modified:
   phpcompta/trunk/include/class_follow_up.php
   phpcompta/trunk/sql/upgrade.sql
Log:
0000605: Ajouter interface pour les documents state

Modified: phpcompta/trunk/include/class_follow_up.php
===================================================================
--- phpcompta/trunk/include/class_follow_up.php 2012-06-21 16:49:45 UTC (rev 
4970)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-21 17:13:37 UTC (rev 
4971)
@@ -693,12 +693,14 @@
              select ag_id,to_char(ag_timestamp,'DD.MM.YYYY') as my_date,
                         to_char(ag_remind_date,'DD.MM.YYYY') as my_remind,
                         f_id_dest,
+                        s_value,
              ag_title,dt_value,ag_ref, ag_priority,ag_state,
                        coalesce((select p_name from profile where 
p_id=ag_dest),'Aucun groupe') as dest,
                                (select ad_value from fiche_Detail where 
f_id=action_gestion.f_id_dest and ad_id=1) as name,
                     (select count(d_id) from document where 
document.ag_id=action_gestion.ag_id) as cnt_doc
              from action_gestion
              join document_type on (ag_type=dt_id)
+                        join document_state on (ag_state=s_id)
              where $p_filter_doc $p_search $sort";
                $max_line = $this->db->count_sql($sql);
                $step = $_SESSION['g_pagesize'];
@@ -788,28 +790,11 @@
                                $r.="<td ></td>";
 
                        $r.="<td>" . $row['dt_value'] . "</td>";
+
+                       $r.=td($row['s_value']);
                        /*
                         * State
                         */
-                       switch ($row['ag_state'])
-                       {
-                               case 1:
-                                       $state = 'Fermé';
-                                       break;
-                               case 2:
-                                       $state = "A suivre";
-                                       break;
-                               case 3:
-                                       $state = "A faire";
-                                       break;
-                               case 4:
-                                       $state = "Abandonné";
-                                       break;
-                       }
-                       $r.=td($state);
-                       /*
-                        * State
-                        */
                        switch ($row['ag_priority'])
                        {
                                case 1:

Modified: phpcompta/trunk/sql/upgrade.sql
===================================================================
--- phpcompta/trunk/sql/upgrade.sql     2012-06-21 16:49:45 UTC (rev 4970)
+++ phpcompta/trunk/sql/upgrade.sql     2012-06-21 17:13:37 UTC (rev 4971)
@@ -426,3 +426,17 @@
  update menu_ref set me_file='export_follow_up_csv.php' where 
me_code='CSV:ActionGestion';
  update menu_ref set me_file='export_stock_histo_csv.php' where 
me_code='CSV:StockHisto';
  update menu_ref set me_file='export_stock_resume_list.php' where 
me_code='CSV:StockResmList';
+
+INSERT INTO menu_ref(
+            me_code, me_menu, me_file, me_url, me_description, me_parameter,
+            me_javascript, me_type)
+    VALUES ('CFGDOCST', 'Etat des documents', 'doc_state.inc.php', null, 'Etat 
des documents', null,null,'ME');
+
+INSERT INTO profile_menu(
+             me_code, me_code_dep, p_id, p_order, p_type_display, pm_default)
+    VALUES ('CFGDOCST', 'DIVPARM', 1, 9, 'E', 0);
+INSERT INTO profile_menu(
+             me_code, me_code_dep, p_id, p_order, p_type_display, pm_default)
+    VALUES ('CFGDOCST', 'DIVPARM', 2,9, 'E', 0);
+
+alter sequence document_state_s_id_seq restart with 100;
\ No newline at end of file



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu