From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 18 Sep 2015 09:23:52 +0000 (+0000)
Subject: Update document templates
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5c1ac96c3f489fd0ca138c0c74eb3496399ccda7;p=cubeextranet.git

Update document templates
change default alwaysHTML5 to false
Update FLF Links
---

diff --git a/images/extranet/devis.png b/images/extranet/devis.png
index 46b093c1e..9b27fe010 100644
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 59a49f409..e286a568f 100644
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 c34ab000d..a0b6e535f 100644
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 c4ed1faed..e70b1c43e 100644
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 a94e7f2e3..849d444c6 100644
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 9b01f2c39..6ce7e54d3 100644
--- 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 52b06c46d..1c42efa1f 100644
--- 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);