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

Restructure files , move show_document_modele.php to export_document_template.php

Browse source
This commit is contained in:
Dany De Bontridder 2015-10-17 17:01:04 +02:00
parent 9da5661d42
commit 659cbc6b0f
5 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/ajax/ajax_mod_document.php
View file

@ -28,7 +28,7 @@ require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
require_once NOALYSS_INCLUDE.'/class/class_document_modele.php'; require_once NOALYSS_INCLUDE.'/class/class_document_modele.php';
/* 1. Check security */ /* 1. Check security */
$cn=Dossier::id(); $cn=Dossier::connect();
/* 2. find the document */ /* 2. find the document */
$doc=new Document_Modele($cn,$id); $doc=new Document_Modele($cn,$id);

9
include/class/class_document_modele.php
View file

@ -52,8 +52,8 @@ class Document_modele
*/ */
function myList() function myList()
{ {
$s=dossier::get(); $dosid=dossier::id();
$sql="select md_id,md_name,md_affect,dt_value from document_modele join document_type on(dt_id=md_type) order by md_name"; $sql="select md_id,md_name,md_affect,dt_value,md_filename from document_modele join document_type on(dt_id=md_type) order by md_name";
$Res=$this->cn->exec_sql($sql); $Res=$this->cn->exec_sql($sql);
$all=Database::fetch_all($Res); $all=Database::fetch_all($Res);
$r=''; $r='';
@ -80,14 +80,15 @@ class Document_modele
$r.="</td>"; $r.="</td>";
$r.=td(h($row['md_affect'])); $r.=td(h($row['md_affect']));
$r.="<td>"; $r.="<td>";
$r.='<A HREF="show_document_modele.php?md_id='.$row['md_id'].'&'.$s.'">Document</a>'; $href=http_build_query(array('gDossier'=>$dosid,'md_id'=>$row['md_id'],'act'=>'RAW:document_template'));
$r.='<A HREF="export.php?'.$href.'">'.h($row['md_filename']).'</a>';
$r.="</td>"; $r.="</td>";
$r.="<TD>"; $r.="<TD>";
$c=new ICheckBox(); $c=new ICheckBox();
$c->name="dm_remove_".$row['md_id']; $c->name="dm_remove_".$row['md_id'];
$r.=$c->input(); $r.=$c->input();
$r.="</td>"; $r.="</td>";
$r.=td(HtmlInput::detail_modele_document($row['md_id'],'Modifier')); $r.=td(HtmlInput::detail_modele_document($row['md_id'],_('Modifier')));
$r.="</tr>"; $r.="</tr>";
} }

12
html/show_document_modele.php → include/export/export_document_template.php
View file

@ -21,22 +21,10 @@
/*! \file /*! \file
* \brief send the document template * \brief send the document template
*/ */
require_once '../include/constant.php';
require_once NOALYSS_INCLUDE.'/lib/class_database.php'; require_once NOALYSS_INCLUDE.'/lib/class_database.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php'; require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/class/class_dossier.php'; require_once NOALYSS_INCLUDE.'/class/class_dossier.php';
$gDossier=dossier::id();
$cn=Dossier::connect();
require_once NOALYSS_INCLUDE.'/class/class_user.php';
global $g_user;
$g_user=new User($cn);
$g_user->Check();
$g_user->check_dossier($gDossier);
set_language();
if ( $g_user->check_module("CFGDOC") == 0 ) exit(); if ( $g_user->check_module("CFGDOC") == 0 ) exit();
// retrieve the document // retrieve the document
$r=$cn->exec_sql("select md_id,md_lob,md_filename,md_mimetype $r=$cn->exec_sql("select md_id,md_lob,md_filename,md_mimetype

5
include/template/modele_document.php
View file

@ -60,9 +60,10 @@ echo $a->input();
<td> <td>
<?php echo _("Fichier")?> <?php echo _("Fichier")?>
<?php <?php
$s=dossier::get(); $dosid=dossier::id();
$href=http_build_query(array('gDossier'=>$dosid,'md_id'=>$doc->md_id,'act'=>'RAW:document_template'));
echo '<A HREF="show_document_modele.php?md_id='.$doc->md_id.'&'.$s.'">(fichier actuel)</a>'; echo '<A HREF="export.php?'.$href.'">'.'('._('fichier actuel').')</a>';
?> ?>
</td> </td>
<td> <td>

11
sql/upgrade.sql
View file

@ -7,12 +7,17 @@ CREATE TRIGGER fiche_detail_upd_trg
EXECUTE PROCEDURE comptaproc.fiche_detail_qcode_upd(); EXECUTE PROCEDURE comptaproc.fiche_detail_qcode_upd();
insert into menu_ref(me_code,me_file,me_menu,me_description,me_type) insert into menu_ref(me_code,me_file,me_menu,me_description,me_type)
values ('RAW:receipt','export_receipt.php','Export la pièce','export la pièce justificative d''une opération','PR'); values ('RAW:receipt','export_receipt.php','Exporte la pièce','export la pièce justificative d''une opération','PR');
insert into profile_menu (me_code,p_id,p_type_display) select 'RAW:receipt',p_id,'P' from profile where p_id > 0; insert into profile_menu (me_code,p_id,p_type_display) select 'RAW:receipt',p_id,'P' from profile where p_id > 0;
insert into menu_ref(me_code,me_file,me_menu,me_description,me_type) insert into menu_ref(me_code,me_file,me_menu,me_description,me_type)
values ('RAW:document','export_document.php','Export le document','export le document d''une événement','PR'); values ('RAW:document','export_document.php','Export le document','exporte le document d''un événement','PR');
insert into profile_menu (me_code,p_id,p_type_display) select 'RAW:document',p_id,'P' from profile where p_id > 0; insert into profile_menu (me_code,p_id,p_type_display) select 'RAW:document',p_id,'P' from profile where p_id > 0;
insert into menu_ref(me_code,me_file,me_menu,me_description,me_type)
values ('RAW:document_template','export_document_template.php','Exporte le modèle de document','export le modèle de document utilisé dans le suivi','PR');
insert into profile_menu (me_code,p_id,p_type_display) select 'RAW:document_template',p_id,'P' from profile where p_id > 0;