From e725a10026bf73ad04b4b234dd18058580e8595c Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Fri, 9 Dec 2016 00:32:44 -0200
Subject: [PATCH 1/3] invert F2 and Shift+F2

---
 kfet/templates/kfet/kpsul.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index babd4175..334c5c90 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -1250,13 +1250,13 @@ $(document).ready(function() {
                 return false;
             case 113:
                 if (e.shiftKey) {
-                    // Shift+F2 - Basket reset
-                    resetBasket();
-                    articleSelect.focus();
-                } else {
-                    // F2 - Account reset
+                    // Shift+F2 - Account reset
                     resetAccount();
                     triInput.focus();
+                } else {
+                    // F2 - Basket reset
+                    resetBasket();
+                    articleSelect.focus();
                 }
                 return false;
             case 114:

From d972af685465e4d8bdbef7a9dd8eb04c8d103c20 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Fri, 9 Dec 2016 00:33:18 -0200
Subject: [PATCH 2/3] update help

---
 kfet/templates/kfet/kpsul.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 334c5c90..aefce229 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -48,11 +48,11 @@
       </div>
       <div class="row">
         <div class="col-xs-3"><b>F2</b></div>
-        <div class="col-xs-9">Reset compte</div>
+        <div class="col-xs-9">Reset panier</div>
       </div>
       <div class="row">
         <div class="col-xs-3"><b>Shift + F2</b></div>
-        <div class="col-xs-9">Reset panier</div>
+        <div class="col-xs-9">Reset compte</div>
       </div>
       <div class="row">
         <div class="col-xs-3"><b>F9</b></div>

From 21cf783144df0a1a6f0c03d891775f9648a6dbbd Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Fri, 9 Dec 2016 01:05:30 -0200
Subject: [PATCH 3/3] add special character encoding

---
 kfet/templates/kfet/kpsul.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html
index 9d44a09d..0363483f 100644
--- a/kfet/templates/kfet/kpsul.html
+++ b/kfet/templates/kfet/kpsul.html
@@ -245,12 +245,14 @@ $(document).ready(function() {
         if (account_data['id'] != 0) {
             var url_base = '{% url 'kfet.account.read' 'LIQ' %}';
             url_base = url_base.substr(0, url_base.length - 3);
-            buttons += '<a href="'+ url_base + account_data['trigramme']+'" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>';
+            trigramme = encodeURIComponent(account_data['trigramme']) ;
+            buttons += '<a href="'+ url_base + trigramme +'" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>';
         }
         if (account_data['id'] == 0) {
             var trigramme = triInput.val().toUpperCase();
             var url_base = '{% url 'kfet.account.create' %}'
             if (isValidTrigramme(trigramme)) {
+                trigramme = encodeURIComponent(trigramme);
                 buttons += '<a href="'+url_base+'?trigramme='+trigramme+'" class="btn btn-primary" target="_blank" title="Créer"><span class="glyphicon glyphicon-plus"></span></a>';
             }
         }