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

Merge branch 'devel' into dev9101

Browse source
This commit is contained in:
sparkyx 2023-04-27 18:04:45 +02:00
commit 40bc3fc489
6 changed files with 279 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/ajax/ajax_mod_document.php
View file

@ -27,6 +27,7 @@ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
/* 1. Check security */
$cn=Dossier::connect();
/* 2. find the document */
global $doc;
$doc=new Document_Modele($cn,$id);
/* 3. display it */

50
include/class/document_modele.class.php
View file

@ -34,11 +34,13 @@ class Document_modele
var $sequence; /*!< $sequence sequence number used by the create sequence start with */
var $md_affect; /*!< $md_affect if you can use it in VEN for sale, ACH for purchase or GES for follow-up */
var $md_filename; /*! < $md_filename is the filename of the template */
var $start; /*! < $md_filename is the filename of the template */
//Constructor parameter = database connexion
function __construct($p_cn,$p_id=-1)
{
$this->cn=$p_cn;
$this->md_id=$p_id;
$this->start=0;
}
/*!
@ -157,7 +159,7 @@ class Document_modele
$new_name=tempnam($_ENV['TMP'],'document_');
if ( strlen ($_FILES['doc']['tmp_name']) != 0 )
{
if (move_uploaded_file($_FILES['doc']['tmp_name'],
if ($this->move_uploaded_file($_FILES['doc']['tmp_name'],
$new_name))
{
// echo "Image saved";
@ -174,7 +176,7 @@ class Document_modele
{
$r=Database::fetch_array($ret,0);
$old_oid=$r['md_lob'];
if (strlen($old_oid) != 0)
if (strlen(""??$old_oid) != 0)
$this->cn->lo_unlink($old_oid);
}
// Load new document
@ -196,6 +198,10 @@ class Document_modele
return ;
}
}
function move_uploaded_file($temporary_name, $target_path)
{
return move_uploaded_file ($temporary_name, $target_path);
}
/*!
* \brief Remove a template
* \return nothing
@ -204,19 +210,18 @@ class Document_modele
{
$this->cn->start();
// first we unlink the document
$sql="select md_lob from document_modele where md_id=".$this->md_id;
$res=$this->cn->exec_sql($sql);
$sql="select md_lob from document_modele where md_id=$1";
$res=$this->cn->exec_sql($sql,[$this->md_id]);
$r=Database::fetch_array($res,0);
// if a lob is found
if ( strlen ($r['md_lob']) &&
$this->cn->exist_blob($r['md_lob']) )
if ( !empty ($r['md_lob']) &&$this->cn->exist_blob($r['md_lob']) )
{
// we remove it first
$this->cn->lo_unlink($r['md_lob']);
}
// now we can delete the row
$sql="delete from document_modele where md_id =".$this->md_id;
$sql=$this->cn->exec_sql($sql);
$sql="delete from document_modele where md_id =$1";
$res=$this->cn->exec_sql($sql,[$this->md_id]);
$this->cn->commit();
}
@ -258,11 +263,7 @@ class Document_modele
$r.=td(_('Affectation'));
$waffect=new ISelect();
$waffect->name='md_affect';
$waffect->value=array(
array('value'=>'ACH','label'=>_('Uniquement journaux achat')),
array('value'=>'VEN','label'=>_('Uniquement journaux vente')),
array('value'=>'GES','label'=>_('Partie gestion'))
);
$waffect->value=$this->cn->make_array("select dc_code,dc_comment from public.document_component order by dc_code");
$r.=td($waffect->input());
$r.='</tr>';
@ -280,7 +281,13 @@ class Document_modele
$r.='<td class="notice">Si vous laissez &agrave; 0, la num&eacute;rotation ne changera pas, la prochaine facture sera n+1, n étant le n° que vous avez donn&eacute;</td>';
$r.="</tr>";
$r.='</table>';
$r.='<ul class="aligned-block">';
$r.='<li>';
$r.=HtmlInput::submit('add_document','Ajout');
$r.='</li>';
$r.='<li>';
$r.=HtmlInput::button_hide("add_modele");
$r.='</li>';
$r.="</form></p>";
return $r;
}
@ -323,7 +330,7 @@ class Document_modele
$new_name=tempnam($_ENV['TMP'],'document_');
if ( strlen ($_FILES['doc']['tmp_name']) != 0 )
{
if (move_uploaded_file($_FILES['doc']['tmp_name'],
if ($this->move_uploaded_file($_FILES['doc']['tmp_name'],
$new_name))
{
// echo "Image saved";
@ -344,7 +351,16 @@ class Document_modele
$this->cn->lo_unlink($old_oid);
}
// Load new document
$this->cn->exec_sql("update document_modele set md_lob=".$oid.", md_mimetype='".$_FILES['doc']['type']."' ,md_filename='".$_FILES['doc']['name']."' where md_id=".$this->md_id);
$this->cn->exec_sql("update document_modele
set md_lob=$1,
md_mimetype=$2,
md_filename=$3
where md_id=$4",[
$oid,
$_FILES['doc']['type'],
$_FILES['doc']['name'],
$this->md_id]);
$this->cn->commit();
}
else
@ -357,8 +373,8 @@ class Document_modele
}
catch (Exception $e)
{
record_log($e);
rollback($this->cn);
record_log($e);
$this->cn->rollback();
return ;
}
$this->cn->commit();

1
include/class/follow_up.class.php
View file

@ -427,6 +427,7 @@ class Follow_Up
$aDocMod->name='doc_mod';
$aDocMod->value=$this->db->make_array('select md_id,dt_value||\' : \'||md_name as md_name'.
' from document_modele join document_type on (md_type=dt_id)'.
" where md_affect ='GES' and md_type = ".$this->dt_id.
' order by md_name');
$str_select_doc=$aDocMod->input();
/* if no document then do not show the generate button */

10
include/template/modele_document.php
View file

@ -1,6 +1,7 @@
<?php
//This file is part of NOALYSS and is under GPL
//see licence.txt
global $doc,$cn;
?>
<?php echo HtmlInput::title_box("Modèle de document","mod_doc",'hide')?>
<form method="post" enctype="multipart/form-data">
@ -44,12 +45,9 @@ echo $a->input();
$waffect=new ISelect();
$waffect->name='md_affect';
$waffect->value=array(
array('value'=>'ACH','label'=>_('Uniquement journaux achat')),
array('value'=>'VEN','label'=>_('Uniquement journaux vente')),
array('value'=>'GES','label'=>_('Partie gestion'))
);
$waffect->selected=$doc->md_affect;
$waffect->value=$cn->make_array("select dc_code,dc_comment from public.document_component order by dc_code");
$waffect->selected=$doc->md_affect;
echo $waffect->input();
?>
</td>