[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 05/35: Add defined value OFFICE and GENERATE_
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 05/35: Add defined value OFFICE and GENERATE_PDF |
Date: |
Tue, 24 May 2016 21:25:38 +0000 (UTC) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 5a175224de221a21da40550849953a6ec5af58a0
Author: Dany De Bontridder <address@hidden>
Date: Sat Apr 2 03:44:35 2016 +0200
Add defined value OFFICE and GENERATE_PDF
---
include/constant.php | 4 ++--
include/lib/config_file.php | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/constant.php b/include/constant.php
index de0dcbb..24b0cf5 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -227,8 +227,8 @@ define ("FICHE_TYPE_MATERIAL",7);
* ou
* unoconv -l -v -s localhost
*/
-define ('OFFICE','unoconv ');
-define ('GENERATE_PDF','YES');
+if ( ! defined ('OFFICE')) define ('OFFICE','');
+if ( ! defined ('GENERATE_PDF') ) define ('GENERATE_PDF','NO');
/**
* Pour conversion GIF en PDF
diff --git a/include/lib/config_file.php b/include/lib/config_file.php
index 92403f4..580747a 100644
--- a/include/lib/config_file.php
+++ b/include/lib/config_file.php
@@ -201,6 +201,11 @@ function
display_file_config($p_array,$from_setup=1,$p_os=1)
print ( "// Fix an issue with PDF when exporting receipt in PDF in
ANCGL"."\r\n");
print ( '// define ("FIX_BROKEN_PDF","NO");');
print ("\r\n");
+ print ("// Uncomment if you want to convert to PDF");
+ print ("// With the unoconv tool");
+ print ( "//define ('OFFICE','HOME=/tmp unoconv ');");
+ print ("\r\n");
+ printf("//define ('GENERATE_PDF','YES');");
print ("\r\n");
print ( "// Uncomment if you don't want "."\r\n");
print ( "// to be informed when a new release is "."\r\n");
- [Noalyss-commit] [noalyss] 08/35: Improve Admin/user , use new alert box, (continued)
- [Noalyss-commit] [noalyss] 08/35: Improve Admin/user , use new alert box, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 10/35: Sendmail : Remove dead code, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 14/35: Translation, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 17/35: Limit email : fix small bugs, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 01/35: fid.php : retrieve parameters with safe function, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 22/35: Acc_Ledger_Sold : avoid message when undefined variable, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 12/35: Translation, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 18/35: Documentation sorttable_nosort, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 15/35: Bug : wrong url to update folders, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 27/35: Merge branch 'master' of ssh://ns2git/srv/git/noalyss, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 05/35: Add defined value OFFICE and GENERATE_PDF,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 02/35: Extension : fix path, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 26/35: Import IText, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 23/35: Fix several small bugs, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 35/35: Impress JRN Fix bug with qcode, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 13/35: translation, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 19/35: CFGPLUGIN : Add filter to plugin table, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 20/35: Fiche : détail fiche , change taille id fiche, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 25/35: Fix several small bugs, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 24/35: Cosmetic change CSS for mobile, Dany De Bontridder, 2016/05/24
- [Noalyss-commit] [noalyss] 11/35: Anc_Operation :fix undefined offset in Anc_Operation::save_form_plan, Dany De Bontridder, 2016/05/24