Update document templates

change default alwaysHTML5 to false
Update FLF Links

diff --git a/images/extranet/devis.png b/images/extranet/devis.png
index 46b093c1ed797c20eb47bf0fb0c42bf4f93ab073..9b27fe010ef01dddc2b28521449f8040b5158087 100644 (file)
Binary files a/images/extranet/devis.png and b/images/extranet/devis.png differ

diff --git a/images/extranet/devis2page1.png b/images/extranet/devis2page1.png
index 59a49f409784d74d231ece4edc0e8e228ee9397b..e286a568fabc76b223c5a211a686f011069d39ce 100644 (file)
Binary files a/images/extranet/devis2page1.png and b/images/extranet/devis2page1.png differ

diff --git a/images/extranet/devis2page2.png b/images/extranet/devis2page2.png
index c34ab000df790c321f844a5623eb24dd705440dd..a0b6e535f74ef2daeb012b71c3638d3369fff262 100644 (file)
Binary files a/images/extranet/devis2page2.png and b/images/extranet/devis2page2.png differ

diff --git a/images/extranet/facture-brouillon.png b/images/extranet/facture-brouillon.png
index c4ed1faed29af4e56e631cdc0427b2c017004055..e70b1c43e4646a2f9018edc3586e5d30e4f3094b 100644 (file)
Binary files a/images/extranet/facture-brouillon.png and b/images/extranet/facture-brouillon.png differ

diff --git a/images/extranet/facture.png b/images/extranet/facture.png
index a94e7f2e3c721db412965322efa95c1c8c64863e..849d444c6b34883bcb755173906d5fa5b3d91fd1 100644 (file)
Binary files a/images/extranet/facture.png and b/images/extranet/facture.png differ

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 9b01f2c3997bed369360888c732ad82d74c79ad0..6ce7e54d3cdd1bad3b182a02343fad8e11a02dbb 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -717,7 +717,7 @@ class wsServices extends cubeFlashGateway {
 
                $r = $core->con->select('SELECT url FROM flfref WHERE ref="' . $core->con->escape($this->args['ref']) . '"');
                if ($r->count()) {
-                       header('Location: http://www.flf.fr' . $r->url);
+                       header('Location: http://www.flf.fr' . $r->url . '?tkpub=ecatalogue-general-2016');
                        exit;
                }
        }

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index 52b06c46dba810581f127d7f9f60da863467a806..1c42efa1f56cfe53b80f8e668e3958e6d86587c2 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -291,13 +291,13 @@ class wsBookParametres extends wsParametres {
                $this->forms['offline'] = array('label' => __('Version offline'),
                                                'fieldsnames' => array('offlineTitle', 'offlineLink'));
 
-               $this->fields['alwaysHTML5'] = array('type' => 'boolean', 'default' => 'true', 'editable' => true, 'label' => __('Toujours utiliser la version HTML5'), 'grade' => 3);
+               $this->fields['alwaysHTML5'] = array('type' => 'boolean', 'default' => 'false', 'editable' => true, 'label' => __('Toujours utiliser la version HTML5'), 'grade' => 3);
                $this->fields['mobileVersion'] = array('type' => 'combo', 'default' => 'html5-images', 'editable' => true, 'label' => __('Version mobile'), 'grade' => 3,
                                                       'datas' => array(__('Rediriger vers le PDF') => 'pdf',
                                                                        __('Version HTML5') => 'html5',
                                                                        __("Version HTML5 en images") => 'html5-images')
                );
-               $this->fields['html5priority'] = array('type' => 'boolean', 'default' => 'true', 'editable' => true, 'label' => __("Si flash n'est pas installé, rediriger vers la version HTML5"), 'grade' => 3);
+               $this->fields['html5priority'] = array('type' => 'boolean', 'default' => 'true', 'editable' => true, 'label' => __("Si flash n'est pas installé, rediriger vers la version HTML5"), 'grade' => 1);
 
 
                $this->fields['navOrderH'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ordre des icônes dans la nav') . ' (' . __('Si différente') . ')', 'grade' => 3);