[Phpcompta-dev] r4431 - in phpcompta/trunk: html html/image include sql

phpcompta-dev
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4431 - in phpcompta/trunk: html html/image include sql

From:	phpcompta-dev
Subject:	[Phpcompta-dev] r4431 - in phpcompta/trunk: html html/image include sql
Date:	Mon, 21 Nov 2011 22:18:04 +0100 (CET)
Author: danydb
Date: 2011-11-21 22:18:02 +0100 (Mon, 21 Nov 2011)
New Revision: 4431

Modified:
   phpcompta/trunk/html/image/loading.gif
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/class_anc_acc_list.php
   phpcompta/trunk/sql/object-6.0.sql
Log:
fix details

Modified: phpcompta/trunk/html/image/loading.gif
===================================================================
(Binary files differ)

Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css      2011-11-21 20:20:59 UTC (rev 4430)
+++ phpcompta/trunk/html/style.css      2011-11-21 21:18:02 UTC (rev 4431)
@@ -836,6 +836,7 @@
 h2.dossier {
        color:darkblue;
        font-style: italic;
+display:inline;
 
 font-size:20px;
 margin:0;

Modified: phpcompta/trunk/include/class_anc_acc_list.php
===================================================================
--- phpcompta/trunk/include/class_anc_acc_list.php      2011-11-21 20:20:59 UTC 
(rev 4430)
+++ phpcompta/trunk/include/class_anc_acc_list.php      2011-11-21 21:18:02 UTC 
(rev 4431)
@@ -29,9 +29,9 @@
 class Anc_Acc_List extends Anc_Acc_Link
 {
   /**
-   address@hidden display form to get the parameter 
+   address@hidden display form to get the parameter
    *  - card_poste 1 by card, 2 by account
-   *  - from_poste 
+   *  - from_poste
    *  - to_poste
    *  - from from date
    *  - to until date
@@ -48,7 +48,7 @@
                        array('value'=>4,'label'=>'Par activité/Poste 
Comptable')
 
                        );
-    
+
     $icard->selected=$this->card_poste;
     $r.=$icard->input();
     $r.=HtmlInput::request_to_hidden(array('ac'));
@@ -64,7 +64,7 @@
     $date=($date != '')?"  $date":'';
     $sql_from_poste=($this->from_poste!='')?" and  po.po_name >= 
upper('".Database::escape_string($this->from_poste)."')":'';
     $sql_to_poste=($this->to_poste!='')?" and  po.po_name <= 
upper('".Database::escape_string($this->to_poste)."')":'';
-    $this->arow=$this->db->get_array(" 
+    $this->arow=$this->db->get_array("
  SELECT po.po_id, po.pa_id, po.po_name, po.po_description, sum(
         CASE
             WHEN operation_analytique.oa_debit = true THEN 
operation_analytique.oa_amount * (-1)::numeric
@@ -115,7 +115,7 @@
     WHEN operation_analytique.oa_debit = true THEN 
operation_analytique.oa_amount * (-1)::numeric
     ELSE operation_analytique.oa_amount
 END) <> 0::numeric order by po_name,name",array($this->pa_id));
-    
+
   }
 
   /**
@@ -185,8 +185,8 @@
    address@hidden display the button export CSV
    address@hidden $p_hidden is a string containing hidden items
    address@hidden html string
-   */  
-  function show_button($p_hidden)
+   */
+  function show_button($p_hidden="")
   {
     $r="";
     $r.= '<form method="GET" action="export.php"  style="display:inline">';
@@ -224,7 +224,7 @@
         * Show all the result
         */
        $tot_card=0;$prev='';
-       echo '<table class="result" style="margin-left:20px;margin-top:5px">';
+       echo '<table class="result" style="margin-left:5px;margin-top:5px">';
        $tot_glob=0;
        for ($i=0;$i<count($this->arow);$i++)
          {
@@ -538,9 +538,9 @@
          }
       }
 
-                   
 
-   
+
+
   }
 
 }
\ No newline at end of file

Modified: phpcompta/trunk/sql/object-6.0.sql
===================================================================
--- phpcompta/trunk/sql/object-6.0.sql  2011-11-21 20:20:59 UTC (rev 4430)
+++ phpcompta/trunk/sql/object-6.0.sql  2011-11-21 21:18:02 UTC (rev 4431)
@@ -192,7 +192,7 @@
 -- Name: profile_menu_pm_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
 
-SELECT pg_catalog.setval('profile_menu_pm_id_seq', 650, true);
+SELECT pg_catalog.setval('profile_menu_pm_id_seq', 662, true);
 
 
 --
@@ -329,13 +329,20 @@
 INSERT INTO menu_ref VALUES ('TVA', 'Module de TVA', 'tva/index.php', NULL, 
'Cette extension permet de faire les listings et declarations TVA', 
'plugin_code=TVA', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('IMPORTBANK', 'Importation banque', 
'importbank/index.php', NULL, 'Import. fichier CVS de la banque', 
'plugin_code=IMPORTBANK', NULL, 'PL');
 INSERT INTO menu_ref VALUES ('ACH', 'Achat', 'compta_ach.inc.php', NULL, 
'Nouvel achat ou dépense', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCHOP', 'Historique', 'anc_history.inc.php', 
NULL, 'Historique des imputations analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGL', 'Grand''Livre', 
'anc_great_ledger.inc.php', NULL, 'Grand livre d''plan analytique', NULL, NULL, 
'ME');
+INSERT INTO menu_ref VALUES ('ANCBS', 'Balance simple', 
'anc_balance_simple.inc.php', NULL, 'Balance simple des imputations 
analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBC2', 'Balance croisée double', 
'anc_balance_double.inc.php', NULL, 'Balance double croisées des imputations 
analytiques', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCTAB', 'Tableau', 'anc_acc_table.inc.php', 
NULL, 'Tableau lié à la comptabilité', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCBCC', 'Balance Analytique/comptabilité', 
'anc_acc_balance.inc.php', NULL, 'Lien entre comptabilité et Comptabilité 
analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCGR', 'Groupe', 'anc_group_balance.inc.php', 
NULL, 'Balance par groupe', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CSV:AncGrandLivre', 'Impression Grand-Livre', 
NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncBalGroup', 'Export Balance groupe 
analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('OTH:Bilan', 'Export Bilan', NULL, NULL, NULL, 
NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:ledger', 'Export Journaux', NULL, NULL, 
NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:postedetail', 'Export Poste détail', NULL, 
NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:postedetail', 'Export Poste détail', NULL, 
NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:fichedetail', 'Export Fiche détail', NULL, 
NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', NULL, 
NULL, NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('SEARCH', 'Recherche', NULL, NULL, 'Recherche', 
NULL, 'popup_recherche()', 'ME');
 INSERT INTO menu_ref VALUES ('DIVPARM', 'Divers', NULL, NULL, 'Paramètres 
divers', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('CFGTVA', 'TVA', 'tva.inc.php', NULL, 'Config. de 
la tva', NULL, NULL, 'ME');
@@ -346,11 +353,11 @@
 INSERT INTO menu_ref VALUES ('CFGPAY', 'Moyen de paiement', 
'payment_middle.inc.php', NULL, 'Config. des méthodes de paiement', NULL, NULL, 
'ME');
 INSERT INTO menu_ref VALUES ('CFGACC', 'Poste', 'poste.inc.php', NULL, 
'Config. poste comptable de base', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('VEN', 'Vente', 'compta_ven.inc.php', NULL, 
'Nouvelle vente ou recette', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('CFGMENU', 'Config. Menu', 'menu.inc.php', NULL, 
'Configuration des menus et plugins', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('COMPANY', 'Sociétés', 'company.inc.php', NULL, 
'Parametre societe', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PERIODE', 'Période', 'periode.inc.php', NULL, 
'Gestion des périodes', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PDF:fichedetail', 'Export Fiche détail', NULL, 
NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:fiche_balance', 'Export Fiche balance', 
NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique opérations diverses', 
'history_operation.inc.php', NULL, NULL, 'ledger_type=ODS', NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PDF:fiche_balance', 'Export Fiche balance', 
NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:report', 'Export report', NULL, NULL, NULL, 
NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('PDF:report', 'Export report', NULL, NULL, NULL, 
NULL, NULL, 'PR');
@@ -370,7 +377,6 @@
 INSERT INTO menu_ref VALUES ('CSV:ledger', 'Export Journaux', NULL, NULL, 
NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncTable', 'Export Tableau Analytique', 
NULL, NULL, NULL, NULL, NULL, 'PR');
 INSERT INTO menu_ref VALUES ('CSV:AncAccList', 'Export Historique Compt. 
Analytique', NULL, NULL, NULL, NULL, NULL, 'PR');
-INSERT INTO menu_ref VALUES ('new_line', NULL, NULL, NULL, 'Saut de ligne', 
NULL, NULL, 'SP');
 INSERT INTO menu_ref VALUES ('SUPPL', 'Fournisseur', 'supplier.inc.php', NULL, 
'Suivi fournisseur', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('MODOP', 'Modification d''opérations', 
'modop/index.php', NULL, 'Modification opérations', 'plugin_code=MODOP', NULL, 
'PL');
 INSERT INTO menu_ref VALUES ('LET', 'Lettrage', NULL, NULL, 'Lettrage', NULL, 
NULL, 'ME');
@@ -390,7 +396,7 @@
 INSERT INTO menu_ref VALUES ('CFGSEC', 'Sécurité', 'param_sec.inc.php', NULL, 
'configuration de la sécurité', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PLANANC', 'Plan Compt. analytique', 
'anc_pa.inc.php', NULL, 'Plan analytique', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('ANCGROUP', 'Groupe', 'anc_group.inc.php', NULL, 
'Groupe analytique', NULL, NULL, 'ME');
-INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', 'anc_imp.inc.php', NULL, 
'Impression compta. analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ODSIMP', 'Historique opérations diverses', 
'history_operation.inc.php', NULL, 'Historique opérations diverses', 
'ledger_type=ODS', NULL, 'ME');
 INSERT INTO menu_ref VALUES ('VENMENU', 'Vente / Recette', NULL, NULL, 'Menu 
ventes et recettes', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('PREFERENCE', 'Préférence', 'pref.inc.php', NULL, 
'Préférence', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('HIST', 'Historique', 
'history_operation.inc.php', NULL, 'Historique', 'ledger_type=ALL', NULL, 'ME');
@@ -428,6 +434,8 @@
 INSERT INTO menu_ref VALUES ('PRINTCARD', 'Catégorie de Fiches', 
'impress_fiche.inc.php', NULL, 'Impression catégorie de fiches', NULL, NULL, 
'ME');
 INSERT INTO menu_ref VALUES ('PRINT', 'Impression', NULL, NULL, 'Menu 
impression', NULL, NULL, 'ME');
 INSERT INTO menu_ref VALUES ('ACCESS', 'Accueil', NULL, 'user_login.php', 
'Accueil', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('ANCIMP', 'Impression', NULL, NULL, 'Impression 
compta. analytique', NULL, NULL, 'ME');
+INSERT INTO menu_ref VALUES ('new_line', 'saut de ligne', NULL, NULL, 'Saut de 
ligne', NULL, NULL, 'SP');
 
 
 --
@@ -448,7 +456,6 @@
 INSERT INTO profile_menu VALUES (237, 'EXT', NULL, 6, 55, 'M', 0);
 INSERT INTO profile_menu VALUES (240, 'FIMP', 'MENUFIN', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (214, 'FREC', 'MENUFIN', 6, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', NULL);
 INSERT INTO profile_menu VALUES (213, 'FSALDO', 'MENUFIN', 6, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (182, 'CFGATCARD', 'DIVPARM', 6, 9, 'E', 0);
 INSERT INTO profile_menu VALUES (68, 'CFGATCARD', 'DIVPARM', 1, 9, 'E', 0);
@@ -468,9 +475,11 @@
 INSERT INTO profile_menu VALUES (181, 'CFGCATDOC', 'DIVPARM', 6, 8, 'E', 0);
 INSERT INTO profile_menu VALUES (258, 'CFGMENU', 'MOD', 6, NULL, 'E', 0);
 INSERT INTO profile_menu VALUES (259, 'CFGPRO', 'MOD', 6, NULL, 'E', 0);
+INSERT INTO profile_menu VALUES (651, 'ANCHOP', 'ANCIMP', 1, 10, 'E', 0);
 INSERT INTO profile_menu VALUES (173, 'COMPTA', NULL, 1, 40, 'M', 0);
 INSERT INTO profile_menu VALUES (55, 'PERIODE', 'PARAM', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (56, 'DIVPARM', 'PARAM', 1, 3, 'E', 0);
+INSERT INTO profile_menu VALUES (652, 'ANCGL', 'ANCIMP', 1, 20, 'E', 0);
 INSERT INTO profile_menu VALUES (189, 'PLANANC', 'ANC', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (190, 'CFGCARDCAT', 'DIVPARM', 6, 7, 'E', 0);
 INSERT INTO profile_menu VALUES (191, 'ANCODS', 'ANC', 6, 2, 'E', 0);
@@ -478,26 +487,32 @@
 INSERT INTO profile_menu VALUES (193, 'ANCIMP', 'ANC', 6, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (60, 'CFGTVA', 'DIVPARM', 1, 5, 'E', 0);
 INSERT INTO profile_menu VALUES (196, 'PREFERENCE', NULL, 6, 15, 'M', 1);
+INSERT INTO profile_menu VALUES (653, 'ANCBS', 'ANCIMP', 1, 30, 'E', 0);
 INSERT INTO profile_menu VALUES (199, 'CUST', 'GESTION', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (200, 'SUPPL', 'GESTION', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (201, 'ADM', 'GESTION', 6, 3, 'E', 0);
 INSERT INTO profile_menu VALUES (202, 'CARD', 'GESTION', 6, 6, 'E', 0);
+INSERT INTO profile_menu VALUES (654, 'ANCBC2', 'ANCIMP', 1, 40, 'E', 0);
 INSERT INTO profile_menu VALUES (203, 'STOCK', 'GESTION', 6, 5, 'E', 0);
 INSERT INTO profile_menu VALUES (204, 'FORECAST', 'GESTION', 6, 7, 'E', 0);
 INSERT INTO profile_menu VALUES (205, 'FOLLOW', 'GESTION', 6, 8, 'E', 0);
+INSERT INTO profile_menu VALUES (655, 'ANCTAB', 'ANCIMP', 1, 50, 'E', 0);
 INSERT INTO profile_menu VALUES (206, 'VERIFBIL', 'ADV', 6, 21, 'E', 0);
 INSERT INTO profile_menu VALUES (207, 'STOCK', 'ADV', 6, 22, 'E', 0);
 INSERT INTO profile_menu VALUES (208, 'PREDOP', 'ADV', 6, 23, 'E', 0);
+INSERT INTO profile_menu VALUES (656, 'ANCBCC', 'ANCIMP', 1, 60, 'E', 0);
 INSERT INTO profile_menu VALUES (209, 'OPEN', 'ADV', 6, 24, 'E', 0);
+INSERT INTO profile_menu VALUES (657, 'ANCGR', 'ANCIMP', 1, 70, 'E', 0);
+INSERT INTO profile_menu VALUES (658, 'CSV:AncGrandLivre', NULL, 1, NULL, 'P', 
0);
 INSERT INTO profile_menu VALUES (210, 'REPORT', 'ADV', 6, 25, 'E', 0);
 INSERT INTO profile_menu VALUES (211, 'CARD', 'COMPTA', 6, 7, 'E', 0);
 INSERT INTO profile_menu VALUES (212, 'HIST', 'COMPTA', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (215, 'ADV', 'COMPTA', 6, 20, 'E', 0);
 INSERT INTO profile_menu VALUES (216, 'ACCESS', NULL, 6, 25, 'M', 0);
 INSERT INTO profile_menu VALUES (217, 'CSV:histo', NULL, 6, NULL, 'P', 0);
+INSERT INTO profile_menu VALUES (175, 'COMPTA', NULL, 6, 40, 'M', 0);
 INSERT INTO profile_menu VALUES (218, 'LOGOUT', NULL, 6, 30, 'M', 0);
 INSERT INTO profile_menu VALUES (219, 'PRINT', 'GESTION', 6, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (220, 'new_line', NULL, 6, 35, 'M', 0);
 INSERT INTO profile_menu VALUES (221, 'CSV:ledger', NULL, 6, NULL, 'P', 0);
 INSERT INTO profile_menu VALUES (222, 'PDF:ledger', NULL, 6, NULL, 'P', 0);
 INSERT INTO profile_menu VALUES (223, 'PRINT', 'COMPTA', 6, 6, 'E', 0);
@@ -506,6 +521,7 @@
 INSERT INTO profile_menu VALUES (227, 'ACHIMP', 'MENUACH', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (228, 'GESTION', NULL, 6, 45, 'M', 0);
 INSERT INTO profile_menu VALUES (229, 'MENUODS', 'COMPTA', 6, 5, 'E', 0);
+INSERT INTO profile_menu VALUES (662, 'new_line', NULL, 1, 35, 'M', 0);
 INSERT INTO profile_menu VALUES (230, 'ODS', 'MENUODS', 6, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (231, 'ODSIMP', 'MENUODS', 6, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (232, 'ANC', NULL, 6, 50, 'M', 0);
@@ -576,7 +592,6 @@
 INSERT INTO profile_menu VALUES (123, 'CSV:histo', NULL, 1, NULL, 'P', 0);
 INSERT INTO profile_menu VALUES (20, 'LOGOUT', NULL, 1, 30, 'M', 0);
 INSERT INTO profile_menu VALUES (35, 'PRINT', 'GESTION', 1, 4, 'E', 0);
-INSERT INTO profile_menu VALUES (156, 'new_line', NULL, 1, 35, 'M', 0);
 INSERT INTO profile_menu VALUES (124, 'CSV:ledger', NULL, 1, NULL, 'P', 0);
 INSERT INTO profile_menu VALUES (125, 'PDF:ledger', NULL, 1, NULL, 'P', 0);
 INSERT INTO profile_menu VALUES (6, 'PRINT', 'COMPTA', 1, 6, 'E', 0);
@@ -601,6 +616,7 @@
 INSERT INTO profile_menu VALUES (27, 'LETACC', 'LET', 1, 2, 'E', 0);
 INSERT INTO profile_menu VALUES (24, 'LETCARD', 'LET', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (164, 'TVA', 'EXT', 1, NULL, 'S', 0);
+INSERT INTO profile_menu VALUES (659, 'AMORTIS', 'GESTION', 1, 10, 'E', 0);
 INSERT INTO profile_menu VALUES (167, 'MOD', 'PARAM', 1, 1, 'E', 0);
 INSERT INTO profile_menu VALUES (92, 'MENUFIN', 'COMPTA', 1, 4, 'E', 0);
 INSERT INTO profile_menu VALUES (93, 'FIMP', 'MENUFIN', 1, 2, 'E', 0);
[Prev in Thread]
Current Thread
[Next in Thread]
[Phpcompta-dev] r4431 - in phpcompta/trunk: html html/image include sql, phpcompta-dev <=
Prev by Date: [Phpcompta-dev] r4430 - in phpcompta/trunk: . html html/image include
Next by Date: [Phpcompta-dev] r4432 - phpcompta/trunk/html/admin
Previous by thread: [Phpcompta-dev] r4430 - in phpcompta/trunk: . html html/image include
Next by thread: [Phpcompta-dev] r4432 - phpcompta/trunk/html/admin
Index(es):
- Date
- Thread