From 178f62bfa0aca3780b974afccc9734e2dfb09dc4 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <dany@alchimerys.be>
Date: Mon, 14 Jul 2014 19:34:56 +0200
Subject: [PATCH] =?UTF-8?q?task=20#1006=20export=20des=20pi=C3=A8ces=20en?=
 =?UTF-8?q?=20PDF,=20ajout=20des=20fichiers=20pour=20mise=20=C3=A0=20jour?=
 =?UTF-8?q?=20de=20la=20base=20de=20donn=C3=A9es?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 html/admin/sql/patch/upgrade115.sql |  9 ++++++++
 include/constant.php                | 36 +++++++++++++++++++++++++----
 sql/upgrade.sql                     |  6 -----
 3 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 html/admin/sql/patch/upgrade115.sql

diff --git a/html/admin/sql/patch/upgrade115.sql b/html/admin/sql/patch/upgrade115.sql
new file mode 100644
index 000000000..f458f13b2
--- /dev/null
+++ b/html/admin/sql/patch/upgrade115.sql
@@ -0,0 +1,9 @@
+begin;
+
+INSERT INTO menu_ref(me_code, me_menu, me_file,   me_type)VALUES ('PDF:AncReceipt', 'Export pièce PDF',  'export_anc_receipt_pdf.php','PR');
+
+insert into profile_menu(me_code,p_id,p_type_display,pm_default) values ('PDF:AncReceipt',1,'P',0);
+
+update version set val=116;
+
+commit;
diff --git a/include/constant.php b/include/constant.php
index f992846e3..8b77a8cf2 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -59,9 +59,8 @@ $g_captcha=false;
 $g_failed="<span style=\"font-size:18px;color:red\">&#x2716;</span>";
 $g_succeed="<span style=\"font-size:18px;color:green\">&#x2713;</span>";
 /* uncomment for development */
-define ('SVNINFO',6720);
-//define ("DEBUG",true);
-define ("DEBUG",false);
+define ('SVNINFO',6721);
+define ("DEBUG",true);
 
 $version_noalyss=SVNINFO;
 // If you don't want to be notified of the update
@@ -70,7 +69,7 @@ define ("SITE_UPDATE",'http://www.noalyss.eu/last_version.txt');
 define ("SITE_UPDATE_PLUGIN",'http://www.noalyss.eu/plugin_last_version.txt');
 
 
-define ("DBVERSION",115);
+define ("DBVERSION",116);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",15);
 define ('NOTFOUND','--not found--');
@@ -178,7 +177,8 @@ define ("FICHE_TYPE_ACH_MAR",2);
 define ("FICHE_TYPE_ACH_SER",3);
 define ("FICHE_TYPE_ACH_MAT",7);
 define ("FICHE_TYPE_PROJET",26);
-/** -- pour utiliser unoconv démarrer un server libreoffice 
+/** 
+ * -- pour utiliser unoconv démarrer un server libreoffice 
  * commande
  * libreoffice --headless --accept="socket,host=127.0.0.1,port=2002;urp;" --nofirststartwizard 
  * ou
@@ -187,6 +187,32 @@ define ("FICHE_TYPE_PROJET",26);
 define ('OFFICE','unoconv ');
 define ('GENERATE_PDF','YES');
 
+/**
+ * Pour conversion GIF en PDF
+ */
+$convert_gif_pdf='/usr/bin/convert';
+if (file_exists($convert_gif_pdf))
+{
+    define ('CONVERT_GIF_PDF',$convert_gif_pdf);
+} else {
+    define ('CONVERT_GIF_PDF','NOT');
+    
+}
+
+/**
+ * Outil pour manipuler les PDF 
+ */
+$pdftk='/usr/bin/pdftk';
+if (file_exists($pdftk))
+{
+    define ('PDFTK',$pdftk);  
+} 
+else
+{
+    define ('PDFTK','NOT');  
+}
+
+
 define ('JS_INFOBULLE','
         <DIV id="bulle" class="infobulle"></DIV>
         <script type="text/javascript" language="javascript"  src="js/infobulle.js">
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index 26c24e0ba..28bcd7697 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -1,8 +1,2 @@
 insert into fiche_def_ref(frd_id,frd_text) values (26,'Projet');
 insert into attr_min (frd_id,ad_id) values (26,1),(26,9);
-
-INSERT INTO menu_ref(
-            me_code, me_menu, me_file,   me_type)
-    VALUES ('PDF:AncReceipt', 'Export pièce PDF',  'export_anc_receipt_pdf.php','PR');
-
-insert into profile_menu(me_code,p_id,p_type_display,pm_default) values ('PDF:AncReceipt',1,'P',0);
\ No newline at end of file