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

[phpcompta-dev]

Author: danydb
Date: 2011-11-17 12:41:37 +0100 (Thu, 17 Nov 2011)
New Revision: 4373

Added:
   phpcompta/trunk/include/anc_acc_balance.inc.php
   phpcompta/trunk/include/anc_acc_table.inc.php
   phpcompta/trunk/include/anc_balance_double.inc.php
   phpcompta/trunk/include/anc_balance_simple.inc.php
   phpcompta/trunk/include/anc_great_ledger.inc.php
   phpcompta/trunk/include/anc_group_balance.inc.php
   phpcompta/trunk/include/anc_history.inc.php
   phpcompta/trunk/sql/anc-modularity-imp.sql
Removed:
   phpcompta/trunk/include/anc_imp.inc.php
Modified:
   phpcompta/trunk/include/class_anc_acc_list.php
   phpcompta/trunk/include/class_anc_balance_double.php
   phpcompta/trunk/include/class_anc_listing.php
   phpcompta/trunk/include/class_anc_print.php
   phpcompta/trunk/include/class_anc_table.php
   phpcompta/trunk/sql/upgrade.sql
Log:
0000241: Modularit?\195?\169 : ajout impression compta anc

Added: phpcompta/trunk/include/anc_acc_balance.inc.php
===================================================================
--- phpcompta/trunk/include/anc_acc_balance.inc.php                             
(rev 0)
+++ phpcompta/trunk/include/anc_acc_balance.inc.php     2011-11-17 11:41:37 UTC 
(rev 4373)
@@ -0,0 +1,16 @@
+<?php
+
+require_once('class_anc_acc_list.php');
+$tab = new Anc_Acc_List($cn);
+$tab->get_request();
+echo '<form method="get">';
+echo $tab->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', 'Recherche') . '</p>';
+
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $tab->show_button();
+    $tab->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_acc_table.inc.php
===================================================================
--- phpcompta/trunk/include/anc_acc_table.inc.php                               
(rev 0)
+++ phpcompta/trunk/include/anc_acc_table.inc.php       2011-11-17 11:41:37 UTC 
(rev 4373)
@@ -0,0 +1,16 @@
+<?php
+
+require_once('class_anc_table.php');
+$tab = new Anc_Table($cn);
+$tab->get_request();
+echo '<form method="get">';
+echo $tab->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', 'Recherche') . '</p>';
+
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $tab->show_button();
+    $tab->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_balance_double.inc.php
===================================================================
--- phpcompta/trunk/include/anc_balance_double.inc.php                          
(rev 0)
+++ phpcompta/trunk/include/anc_balance_double.inc.php  2011-11-17 11:41:37 UTC 
(rev 4373)
@@ -0,0 +1,14 @@
+<?php
+
+require_once ('class_anc_balance_double.php');
+$bc = new Anc_Balance_Double($cn);
+$bc->get_request();
+echo '<form method="get">';
+echo $bc->display_form();
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $bc->show_button();
+    echo $bc->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_balance_simple.inc.php
===================================================================
--- phpcompta/trunk/include/anc_balance_simple.inc.php                          
(rev 0)
+++ phpcompta/trunk/include/anc_balance_simple.inc.php  2011-11-17 11:41:37 UTC 
(rev 4373)
@@ -0,0 +1,14 @@
+<?php
+
+require_once ('class_anc_balance_simple.php');
+$bs = new Anc_Balance_Simple($cn);
+$bs->get_request();
+echo '<form method="get">';
+echo $bs->display_form();
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $bs->show_button();
+    echo $bs->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_great_ledger.inc.php
===================================================================
--- phpcompta/trunk/include/anc_great_ledger.inc.php                            
(rev 0)
+++ phpcompta/trunk/include/anc_great_ledger.inc.php    2011-11-17 11:41:37 UTC 
(rev 4373)
@@ -0,0 +1,14 @@
+<?php
+
+require_once('class_anc_grandlivre.php');
+$gl = new Anc_GrandLivre($cn);
+$gl->get_request();
+echo '<form method="get">';
+echo $gl->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', 'Recherche') . '</p>';
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $gl->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_group_balance.inc.php
===================================================================
--- phpcompta/trunk/include/anc_group_balance.inc.php                           
(rev 0)
+++ phpcompta/trunk/include/anc_group_balance.inc.php   2011-11-17 11:41:37 UTC 
(rev 4373)
@@ -0,0 +1,16 @@
+<?php
+
+require_once('class_anc_group.php');
+$gr = new Anc_Group($cn);
+$gr->get_request();
+echo '<form method="get">';
+echo $gr->display_form();
+echo '<p>' . HtmlInput::submit('Recherche', 'Recherche') . '</p>';
+echo '</form>';
+if (isset($_GET['result']))
+{
+    echo $gr->show_button();
+
+    echo $gr->display_html();
+}
+?>

Added: phpcompta/trunk/include/anc_history.inc.php
===================================================================
--- phpcompta/trunk/include/anc_history.inc.php                         (rev 0)
+++ phpcompta/trunk/include/anc_history.inc.php 2011-11-17 11:41:37 UTC (rev 
4373)
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+require_once ('class_anc_listing.php');
+$list = new Anc_Listing($cn);
+$list->get_request();
+
+echo $list->display_form();
+//---- result
+if (isset($_GET['result']))
+{
+    echo '<div class="content">';
+
+    //--------------------------------
+    // export Buttons
+    //---------------------------------
+    echo $list->show_button();
+    echo $list->display_html();
+    echo '</div>';
+}
+echo '</div>';
+?>

Deleted: phpcompta/trunk/include/anc_imp.inc.php
===================================================================
--- phpcompta/trunk/include/anc_imp.inc.php     2011-11-17 00:34:03 UTC (rev 
4372)
+++ phpcompta/trunk/include/anc_imp.inc.php     2011-11-17 11:41:37 UTC (rev 
4373)
@@ -1,189 +0,0 @@
-<?php
-/*
- *   This file is part of PhpCompta.
- *
- *   PhpCompta is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   PhpCompta is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with PhpCompta; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-/* $Revision$ */
-
-// Copyright Author Dany De Bontridder address@hidden
-
-/*!\file
- *
- *
- * \brief this file is included for printing the analytic
- * accountancy.
- *
- */
-require_once("class_ihidden.php");
-require_once('class_anc_operation.php');
-require_once('class_anc_plan.php');
-require_once('ac_common.php');
-$str_dossier=Dossier::get();
-
-//-- the menu
-$menu=array(array("?ac=".$_REQUEST['ac']."&sub=listing&$str_dossier",_("Historique"),_("Historique
 des opérations"),"listing"),
-            array("?ac=".$_REQUEST['ac']."&sub=ancgl&$str_dossier",_("grand 
livre"),_("Grand livre d' plan analytique"),"ancgl"),
-            array("?ac=".$_REQUEST['ac']."&sub=bs&$str_dossier",_("Balance 
simple"),_("Balance simple d'un plan analytique"),"bs"),
-            array("?ac=".$_REQUEST['ac']."&sub=bc2&$str_dossier",_("Balance 
croisée"),_("Balance croisée de 2 plans analytiques"),"bc2"),
-           
array("?ac=".$_REQUEST['ac']."&sub=tab&$str_dossier",_("Tableau"),_("Tableau 
lié à la comptabilité"),'tab'),
-           array("?ac=".$_REQUEST['ac']."&sub=lico&$str_dossier",_("Balance 
comptabilité"),_("Lien entre comptabilité et Comptabilité analytique"),'lico'),
-           
array("?ac=".$_REQUEST['ac']."&sub=group&$str_dossier",_("Groupe"),_("Balance 
par groupe"),'group'),
-
-           );
-$sub=(isset($_GET['sub']))?$_GET['sub']:'no';
-
-echo '<div class="content"  >';
-echo ShowItem($menu,"H","mtitle","mtitle",$sub);
-echo '</div>';
-
-echo '<div class="content" >';
-
-$hidden=new IHidden();
-$str_hidden=$hidden->input("p_action","ca_imp");
-$str_hidden.=$hidden->input("sub",$sub);
-
-// select following the sub action
-//------------------------------------------------------------------------------
-// listing
-if ( $sub=='listing')
-{
-    require_once ('class_anc_listing.php');
-    $list=new Anc_Listing($cn);
-    $list->get_request();
-
-    echo $list->display_form($str_hidden);
-    //---- result
-    if ( isset($_GET['result']) )
-    {
-        echo '<div class="content">';
-
-        //--------------------------------
-        // export Buttons
-        //---------------------------------
-        echo $list->show_button($str_hidden);
-        echo $list->display_html();
-        echo '</div>';
-    }
-    echo '</div>';
-}
-
-//------------------------------------------------------------------------------
-// Simple balance
-if ($sub == 'bs')
-{
-    require_once ('class_anc_balance_simple.php');
-    $bs=new Anc_Balance_Simple($cn);
-    $bs->get_request();
-    echo '<form method="get">';
-    echo $bs->display_form($str_hidden);
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-        echo $bs->show_button($str_hidden);
-        echo $bs->display_html();
-    }
-}
-
-//------------------------------------------------------------------------------
-// crossed balance
-if ( $sub == 'bc2')
-{
-    require_once ('class_anc_balance_double.php');
-    $bc=new Anc_Balance_Double($cn);
-    $bc->get_request ();
-    echo '<form method="get">';
-    echo $bc->display_form($str_hidden);
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-        echo $bc->show_button($str_hidden);
-        echo $bc->display_html();
-    }
-}
-//----------------------------------------------------------------------
-// Table linked between accountancy and analytic
-//---------------------------------------------------------------------------
-if ( $sub == 'tab')
-  {
-    require_once('class_anc_table.php');
-    $tab=new Anc_Table($cn);
-    $tab->get_request();
-    echo '<form method="get">';
-    echo $tab->display_form($str_hidden);
-    echo '<p>'.HtmlInput::submit('Recherche','Recherche').'</p>';
-
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-        echo $tab->show_button($str_hidden);
-       $tab->display_html();
-    }
-  }
-
-//----------------------------------------------------------------------
-//  linked between accountancy and analytic
-//---------------------------------------------------------------------------
-if ( $sub == 'lico')
-  {
-    require_once('class_anc_acc_list.php');
-    $tab=new Anc_Acc_List($cn);
-    $tab->get_request();
-    echo '<form method="get">';
-    echo $tab->display_form($str_hidden);
-    echo '<p>'.HtmlInput::submit('Recherche','Recherche').'</p>';
-
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-        echo $tab->show_button($str_hidden);
-       $tab->display_html();
-    }
-  }
-
-//---------------------------------------------------------------------------
-if ( $sub == 'ancgl')
-  {
-    require_once('class_anc_grandlivre.php');
-    $gl=new Anc_GrandLivre($cn);
-    $gl->get_request();
-    echo '<form method="get">';
-    echo $gl->display_form($str_hidden);
-    echo '<p>'.HtmlInput::submit('Recherche','Recherche').'</p>';
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-       echo $gl->display_html();
-    }
-  }
-//---------------------------------------------------------------------------
-// Balance by group
-//---------------------------------------------------------------------------
-if ( $sub == 'group')
-  {
-    require_once('class_anc_group.php');
-    $gr=new Anc_Group($cn);
-    $gr->get_request();
-    echo '<form method="get">';
-    echo $gr->display_form($str_hidden);
-    echo '<p>'.HtmlInput::submit('Recherche','Recherche').'</p>';
-    echo '</form>';
-    if ( isset($_GET['result']))
-    {
-      echo $gr->show_button($str_hidden);
-
-      echo $gr->display_html();
-    }
-  }

Modified: phpcompta/trunk/include/class_anc_acc_list.php
===================================================================
--- phpcompta/trunk/include/class_anc_acc_list.php      2011-11-17 00:34:03 UTC 
(rev 4372)
+++ phpcompta/trunk/include/class_anc_acc_list.php      2011-11-17 11:41:37 UTC 
(rev 4373)
@@ -51,6 +51,7 @@
     
     $icard->selected=$this->card_poste;
     $r.=$icard->input();
+    $r.=HtmlInput::request_to_hidden(array('ac'));
     return $r;
   }
  /**

Modified: phpcompta/trunk/include/class_anc_balance_double.php
===================================================================
--- phpcompta/trunk/include/class_anc_balance_double.php        2011-11-17 
00:34:03 UTC (rev 4372)
+++ phpcompta/trunk/include/class_anc_balance_double.php        2011-11-17 
11:41:37 UTC (rev 4373)
@@ -322,7 +322,7 @@
         $plan_id->value=$this->db->make_array("select pa_id, pa_name from 
plan_analytique order by pa_name");
         $plan_id->selected=$this->pa_id2;
         $r.= "Plan Analytique :".$plan_id->input();
-
+        $r.=HtmlInput::request_to_hidden(array('ac'));
         $poste=new IText();
         $poste->size=10;
         $r.="Entre le poste ".$poste->input("from_poste2",$this->from_poste2);

Modified: phpcompta/trunk/include/class_anc_listing.php
===================================================================
--- phpcompta/trunk/include/class_anc_listing.php       2011-11-17 00:34:03 UTC 
(rev 4372)
+++ phpcompta/trunk/include/class_anc_listing.php       2011-11-17 11:41:37 UTC 
(rev 4373)
@@ -190,6 +190,7 @@
         $r.= HtmlInput::hidden("from_poste",$this->from_poste);
         $r.= HtmlInput::hidden("to_poste",$this->to_poste);
        $r.=HtmlInput::hidden('act','CSV:AncList');
+        $r.=HtmlInput::hidden('ac',$_REQUEST['ac']);
         $r.= $p_string;
         $r.= dossier::hidden();
         $r.=HtmlInput::submit('bt_csv',"Export en CSV");

Modified: phpcompta/trunk/include/class_anc_print.php
===================================================================
--- phpcompta/trunk/include/class_anc_print.php 2011-11-17 00:34:03 UTC (rev 
4372)
+++ phpcompta/trunk/include/class_anc_print.php 2011-11-17 11:41:37 UTC (rev 
4373)
@@ -116,9 +116,8 @@
         $r.="Depuis : ".$from->input();
         $r.= "jusque : ".$to->input();
         $r.= '<span class="notice">'._('Les dates sont en format 
DD.MM.YYYY').'</span>';
-
+        $r.=HtmlInput::request_to_hidden(array('ac'));
         $r.=$p_hidden;
-       $r.=HtmlInput::hidden('ac',$_REQUEST['ac']);
         $r.='<span style="padding:5px;margin:5px;display:block;">';
         $plan=new Anc_Plan($this->db);
         $plan_id=new ISelect("pa_id");
@@ -141,6 +140,7 @@
         $r.='<span class="notice" style="display:block">'._('Selectionnez le 
plan qui vous intéresse avant de cliquer sur Recherche').'</span>';
 
         $r.='</span>';
+        $r.=HtmlInput::request_to_hidden(array('ac'));
         return $r;
     }
     /*!

Modified: phpcompta/trunk/include/class_anc_table.php
===================================================================
--- phpcompta/trunk/include/class_anc_table.php 2011-11-17 00:34:03 UTC (rev 
4372)
+++ phpcompta/trunk/include/class_anc_table.php 2011-11-17 11:41:37 UTC (rev 
4373)
@@ -44,9 +44,9 @@
                        array('value'=>1,'label'=>'Par fiche'),
                        array('value'=>2,'label'=>'Par poste comptable')
                        );
-    
     $icard->selected=$this->card_poste;
     $r.=$icard->input();
+    $r.=HtmlInput::request_to_hidden(array('ac'));
     return $r;
   }
 

Added: phpcompta/trunk/sql/anc-modularity-imp.sql
===================================================================
--- phpcompta/trunk/sql/anc-modularity-imp.sql                          (rev 0)
+++ phpcompta/trunk/sql/anc-modularity-imp.sql  2011-11-17 11:41:37 UTC (rev 
4373)
@@ -0,0 +1,9 @@
+
+insert into menu_ref(me_code,me_menu,me_file,me_description,me_type) 
+values ('ANCHOP','Historique','anc_history.inc.php','Historique des 
imputations analytiques','ME')
+values ('ANCGL','Grand''Livre','anc_great_ledger.inc.php','Grand livre d''plan 
analytique','ME')
+values ('ANCBS','Balance simple','anc_balance_simple.inc.php','Balance simple 
des imputations analytiques','ME')
+values ('ANCBC2','Balance croisée 
double','anc_balance_double.inc.php','Balance double croisées des imputations 
analytiques','ME')
+values ('ANCTAB','Tableau','anc_acc_table.inc.php','Tableau lié à la 
comptabilité','ME')
+values ('ANCBCC','Balance 
Analytique/comptabilité','anc_acc_balance.inc.php','Lien entre comptabilité et 
Comptabilité analytique','ME')
+values ('ANCGR','Groupe','anc_group_balance.inc.php','Balance par 
groupe','ME');

Modified: phpcompta/trunk/sql/upgrade.sql
===================================================================
--- phpcompta/trunk/sql/upgrade.sql     2011-11-17 00:34:03 UTC (rev 4372)
+++ phpcompta/trunk/sql/upgrade.sql     2011-11-17 11:41:37 UTC (rev 4373)
@@ -26,10 +26,17 @@
 \i object-6.0.sql
 \i extension.sql
 \i ajax-direct-form.sql
+
+\i mode_paiement.sql
+\i anc-modularity-imp.sql
+
+
+create unique index qcode_idx on fiche_detail (ad_value) where ad_id=23;
+
+
+---------------------------------------------------
 -- for account repository
+---------------------------------------------------
 -- \i change_account_repo.sql
 -- \i style-epad.sql
-\i mode_paiement.sql
-
-create unique index qcode_idx on fiche_detail (ad_value) where ad_id=23;
 commit;