[Phpcompta-dev] r4982 - in phpcompta/trunk: html html/js include sql

[phpcompta-dev]

Author: danydb
Date: 2012-06-23 02:45:16 +0200 (Sat, 23 Jun 2012)
New Revision: 4982

Modified:
   phpcompta/trunk/html/js/card.js
   phpcompta/trunk/html/style.css
   phpcompta/trunk/include/ajax_get_profile.php
   phpcompta/trunk/include/fiche.inc.php
   phpcompta/trunk/sql/upgrade.sql
Log:
0000577: Remplacer FICHE par PRINTCARD

Modified: phpcompta/trunk/html/js/card.js
===================================================================
--- phpcompta/trunk/html/js/card.js     2012-06-23 00:32:15 UTC (rev 4981)
+++ phpcompta/trunk/html/js/card.js     2012-06-23 00:45:16 UTC (rev 4982)
@@ -470,7 +470,7 @@
     if ( obj.elements &&  obj.elements['ref'] )
     {
         ref='&ref';
-    }
+    } 
     var content='div_new_card';
     var nTop=posY-40;
     var nLeft=posX-20;

Modified: phpcompta/trunk/html/style.css
===================================================================
--- phpcompta/trunk/html/style.css      2012-06-23 00:32:15 UTC (rev 4981)
+++ phpcompta/trunk/html/style.css      2012-06-23 00:45:16 UTC (rev 4982)
@@ -125,7 +125,7 @@
 div.u_tool {
        float:left;
        width:  100%;
-       padding-bottom: 7px;
+       padding-bottom: 20px;
        }
 div.u_tool div.name {
        float:left;
@@ -834,7 +834,7 @@
        border-style:  inset ;
        color:red;
        margin:1 2 1 2;
-        
+
        }
        td.tool {
        border: solid 1px gray;

Modified: phpcompta/trunk/include/ajax_get_profile.php
===================================================================
--- phpcompta/trunk/include/ajax_get_profile.php        2012-06-23 00:32:15 UTC 
(rev 4981)
+++ phpcompta/trunk/include/ajax_get_profile.php        2012-06-23 00:45:16 UTC 
(rev 4982)
@@ -35,11 +35,13 @@
 ?>
 <hr>
 <h1>Profil <?=$profile->p_name?></h1>
+<? if ($p_id > 0 ) : ?>
 <a href="javascript:void(0)" class="line" 
onclick="profile_show('profile_gen_div')"><?=_('Nom')?></a>&nbsp;
 <a href="javascript:void(0)" class="line" 
onclick="profile_show('profile_menu_div')"><?=_('Détail Menus')?></a>&nbsp;
 <a href="javascript:void(0)" class="line" 
onclick="profile_show('profile_print_div')"><?=_('Détail 
Impressions')?></a>&nbsp;
 <a href="javascript:void(0)" class="line" style="" 
onclick="profile_show('profile_gestion_div')"><?=_('Action Gestion')?> 
</a>&nbsp;
 <a href="javascript:void(0)" class="line" 
onclick="profile_show('profile_repo_div')"><?=_('Dépôts')?></a>&nbsp;
+<? endif; ?>
 
 <?
 $id=HtmlInput::hidden('p_id',$profile->p_id);
@@ -50,7 +52,16 @@
 
 $with_direct_form=new ICheckBox("with_direct_form","t");
 $with_direct_form->set_check($profile->with_direct_form);
-echo '<div style="display:none" id="profile_gen_div">';
+
+// If $p_id == -1 it is a new profile
+if ( $p_id > 0 )
+{
+       echo '<div style="display:none" id="profile_gen_div">';
+}
+else
+{
+       echo '<div  id="profile_gen_div">';
+}
 echo '<form method="POST" onsubmit="return confirm (\'vous confirmez\')">';
 echo HtmlInput::hidden('tab','profile_gen_div');
 echo HtmlInput::hidden('p_id',$profile->p_id);

Modified: phpcompta/trunk/include/fiche.inc.php
===================================================================
--- phpcompta/trunk/include/fiche.inc.php       2012-06-23 00:32:15 UTC (rev 
4981)
+++ phpcompta/trunk/include/fiche.inc.php       2012-06-23 00:45:16 UTC (rev 
4982)
@@ -99,7 +99,7 @@
 
 $h_add_card_b = new IButton('add_card');
 $h_add_card_b->label = _('Créer une nouvelle fiche');
-$h_add_card_b->javascript = 
"dis_blank_card({gDossier:$gDossier,fd_id:$fd_id})";
+$h_add_card_b->javascript = 
"dis_blank_card({gDossier:$gDossier,fd_id:$fd_id,ref:2})";
 $str_add_card = ($g_user->check_action(FICADD) == 1) ? $h_add_card_b->input() 
: "";
 
 /*

Modified: phpcompta/trunk/sql/upgrade.sql
===================================================================
--- phpcompta/trunk/sql/upgrade.sql     2012-06-23 00:32:15 UTC (rev 4981)
+++ phpcompta/trunk/sql/upgrade.sql     2012-06-23 00:45:16 UTC (rev 4982)
@@ -472,8 +472,9 @@
 create sequence uos_pk_seq;
 create table tool_uos (  uos_value bigint default nextval ('uos_pk_seq') 
primary key );
 
--- update menu_ref set me_code='CFGCARD',me_file='cfgfiche.inc.php' where 
me_code='CARD';
--- update menu_ref set me_code='CARD',me_file='fiche.inc.php' where 
me_code='PRINTCARD';
--- update profile_menu set me_code='CARD' where me_code='CFGCARD';
--- update profile_menu set me_code='CFGCARD' , me_code_dep='PARAM' where 
me_code='CARD' and me_code_dep='PRINT';
--- update menu_ref set 
me_menu='Fiche',me_description='Liste,Balance,Historique par fiche' where 
me_code='CARD'
+update menu_ref set me_code='CFGCARD',me_file='cfgfiche.inc.php' where 
me_code='CARD';
+update menu_ref set me_code='CARD',me_file='fiche.inc.php' where 
me_code='PRINTCARD';
+update profile_menu set me_code='CARD' where me_code='CFGCARD';
+update profile_menu set me_code='CFGCARD' , me_code_dep='PARAM' where 
me_code='CARD' and me_code_dep='PRINT';
+update menu_ref set me_menu='Fiche',me_description='Liste,Balance,Historique 
par fiche' where me_code='CARD';
+update menu_ref set me_menu='Fiche',me_description='Configuration de catégorie 
de fiches' where me_code='CFGCARD';



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