admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

0000577: Remplacer FICHE par PRINTCARD

Browse source
This commit is contained in:
Dany De Bontridder 2012-06-23 00:45:16 +00:00
parent e1e16dd360
commit 09ea4f71a2
5 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/js/card.js
View file

@ -470,7 +470,7 @@ function dis_blank_card(obj)
if ( obj.elements && obj.elements['ref'] )
{
ref='&ref';
}
}
var content='div_new_card';
var nTop=posY-40;
var nLeft=posX-20;

4
html/style.css
View file

@ -125,7 +125,7 @@ div.u_tmenu div.u_tool {
div.u_tool {
float:left;
width: 100%;
padding-bottom: 7px;
padding-bottom: 20px;
}
div.u_tool div.name {
float:left;
@ -834,7 +834,7 @@ a#anchorbutton:hover, .button:hover,a.button:hover,div.content a.button:hover {
border-style: inset ;
color:red;
margin:1 2 1 2;
}
td.tool {
border: solid 1px gray;

13
include/ajax_get_profile.php
View file

@ -35,11 +35,13 @@ $add_one=HtmlInput::button("add", "Ajout Menu","onclick=\"add_menu({dossier:$gDo
?>
<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_calc->set_check($profile->with_calc);
$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);

2
include/fiche.inc.php
View file

@ -99,7 +99,7 @@ $array = Fiche::get_fiche_def($cn, $_GET['cat'], 'name_asc');
$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() : "";
/*

11
sql/upgrade.sql
View file

@ -472,8 +472,9 @@ CREATE INDEX quant_sold_jrn_fki
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';