From 71b4e6253da3abc8126b433f86ca54fe47081693 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Sat, 7 Apr 2018 13:42:19 +0200
Subject: [PATCH] Merge branch 'master' into aureplop/cof-tests_calendar

---
 kfet/templates/kfet/account.html                     | 2 +-
 kfet/templates/kfet/account_negative.html            | 2 +-
 kfet/templates/kfet/article.html                     | 2 +-
 kfet/templates/kfet/article_inventories_snippet.html | 2 +-
 kfet/templates/kfet/article_suppliers_snippet.html   | 2 +-
 kfet/templates/kfet/category.html                    | 2 +-
 kfet/templates/kfet/checkout.html                    | 2 +-
 kfet/templates/kfet/checkout_read.html               | 2 +-
 kfet/templates/kfet/inventory.html                   | 2 +-
 kfet/templates/kfet/inventory_read.html              | 2 +-
 kfet/templates/kfet/order.html                       | 2 +-
 kfet/templates/kfet/order_create.html                | 2 +-
 kfet/templates/kfet/order_read.html                  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/kfet/templates/kfet/account.html b/kfet/templates/kfet/account.html
index a1a1f6bb..9b63c1da 100644
--- a/kfet/templates/kfet/account.html
+++ b/kfet/templates/kfet/account.html
@@ -39,7 +39,7 @@
   <div class="table-responsive">
     <table
         class="table table-hover table-condensed sortable"
-        // Initial sort: [(trigramme,asc)]
+        {# Initial sort: [(trigramme,asc)] #}
         data-sortlist="[[0,0]]">
       <thead>
         <tr>
diff --git a/kfet/templates/kfet/account_negative.html b/kfet/templates/kfet/account_negative.html
index b67b94fc..fa8b508d 100644
--- a/kfet/templates/kfet/account_negative.html
+++ b/kfet/templates/kfet/account_negative.html
@@ -37,7 +37,7 @@
 <div class="table-responsive">
   <table
       class="table table-hover table-condensed sortable"
-      // Initial sort: [(trigramme,asc)]
+      {# Initial sort: [(trigramme,asc)] #}
       data-sortlist="[[0,0]]">
     <thead>
       <tr>
diff --git a/kfet/templates/kfet/article.html b/kfet/templates/kfet/article.html
index caf70cfa..87a8b76a 100644
--- a/kfet/templates/kfet/article.html
+++ b/kfet/templates/kfet/article.html
@@ -28,7 +28,7 @@
 <div class="table-responsive">
   <table
       class="table table-hover table-condensed sortable"
-      // Initial sort: [(is_sold,desc), (name,asc)]
+      {# Initial sort: [(is_sold,desc), (name,asc)] #}
       data-sortlist="[[3,1], [0,0]]">
     <thead>
       <tr>
diff --git a/kfet/templates/kfet/article_inventories_snippet.html b/kfet/templates/kfet/article_inventories_snippet.html
index df5c8dea..6a368ab1 100644
--- a/kfet/templates/kfet/article_inventories_snippet.html
+++ b/kfet/templates/kfet/article_inventories_snippet.html
@@ -1,6 +1,6 @@
 <table
     class="table table-hover table-condensed sortable"
-    // Initial sort: [(inventory.at,desc)]
+    {# Initial sort: [(inventory.at,desc)] #}
     data-sortlist="[[0,1]]">
   <thead>
     <tr>
diff --git a/kfet/templates/kfet/article_suppliers_snippet.html b/kfet/templates/kfet/article_suppliers_snippet.html
index 84922035..f82a313d 100644
--- a/kfet/templates/kfet/article_suppliers_snippet.html
+++ b/kfet/templates/kfet/article_suppliers_snippet.html
@@ -1,6 +1,6 @@
 <table
     class="table table-hover table-condensed sortable"
-    // Initial sort: [(at,desc)]
+    {# Initial sort: [(at,desc)] #}
     data-sortlist="[[0,1]]">
   <thead>
     <tr>
diff --git a/kfet/templates/kfet/category.html b/kfet/templates/kfet/category.html
index a31cc3cf..0a8b58be 100644
--- a/kfet/templates/kfet/category.html
+++ b/kfet/templates/kfet/category.html
@@ -19,7 +19,7 @@
 <div class="table-responsive">
   <table
       class="table table-hover table-condensed sortable"
-      // Initial sort: [(name,asc)]
+      {# Initial sort: [(name,asc)] #}
       data-sortlist="[[0,0]]">
     <thead>
       <tr>
diff --git a/kfet/templates/kfet/checkout.html b/kfet/templates/kfet/checkout.html
index c2c5e4bc..96ce0577 100644
--- a/kfet/templates/kfet/checkout.html
+++ b/kfet/templates/kfet/checkout.html
@@ -26,7 +26,7 @@
 <div class="table-responsive">
   <table
       class="table table-hover table-condensed sortable"
-      // Initial sort: [(valid_to,desc)]
+      {# Initial sort: [(valid_to,desc)] #}
       data-sortlist="[[3,1]]">
     <thead>
       <tr>
diff --git a/kfet/templates/kfet/checkout_read.html b/kfet/templates/kfet/checkout_read.html
index 37a6e173..acfd4462 100644
--- a/kfet/templates/kfet/checkout_read.html
+++ b/kfet/templates/kfet/checkout_read.html
@@ -16,7 +16,7 @@
     {% else %}
       <table
           class="table table-hover table-condensed sortable"
-          // Initial sort: [(at,desc)]
+          {# Initial sort: [(at,desc)] #}
           data-sortlist="[[0,1]]">
         <thead>
           <tr>
diff --git a/kfet/templates/kfet/inventory.html b/kfet/templates/kfet/inventory.html
index f05dc32a..bee373bc 100644
--- a/kfet/templates/kfet/inventory.html
+++ b/kfet/templates/kfet/inventory.html
@@ -19,7 +19,7 @@
 <div class="table-responsive">
   <table
       class="table table-hover table-condensed sortable"
-      // Initial sort: [(at,desc)]
+      {# Initial sort: [(at,desc)] #}
       data-sortlist="[[0,1]]">
     <thead>
       <tr>
diff --git a/kfet/templates/kfet/inventory_read.html b/kfet/templates/kfet/inventory_read.html
index 1edc21e0..964e81b0 100644
--- a/kfet/templates/kfet/inventory_read.html
+++ b/kfet/templates/kfet/inventory_read.html
@@ -29,7 +29,7 @@
 <div class="table-responsive">
   <table
       class="table table-condensed table-hover table-striped sortable"
-      // Initial sort: [(article.name,asc)]
+      {# Initial sort: [(article.name,asc)] #}
       data-sortlist="[[0,0]]">
     <thead>
       <tr>
diff --git a/kfet/templates/kfet/order.html b/kfet/templates/kfet/order.html
index 0e4ed868..37391b87 100644
--- a/kfet/templates/kfet/order.html
+++ b/kfet/templates/kfet/order.html
@@ -57,7 +57,7 @@
   <div class="table-responsive">
     <table
         class="table table-hover table-condensed sortable"
-        // Initial sort: [(at,desc)]
+        {# Initial sort: [(at,desc)] #}
         data-sortlist="[[1,1]]">
       <thead>
         <tr>
diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html
index e2e7c4cd..7cb4d1cb 100644
--- a/kfet/templates/kfet/order_create.html
+++ b/kfet/templates/kfet/order_create.html
@@ -13,7 +13,7 @@
   <div class="table-responsive">
   <table
       class="table table-hover table-condensed table-condensed-input text-center table-striped sortable"
-      // Initial sort: [(name,asc)]
+      {# Initial sort: [(name,asc)] #}
       data-sortlist="[[0,0]]">
     <thead>
       <tr>
diff --git a/kfet/templates/kfet/order_read.html b/kfet/templates/kfet/order_read.html
index 9241c394..41abc381 100644
--- a/kfet/templates/kfet/order_read.html
+++ b/kfet/templates/kfet/order_read.html
@@ -44,7 +44,7 @@
   <div class="table-responsive">
     <table
         class="table table-condensed table-hover table-striped sortable"
-        // Initial sort: [(article.name,asc)]
+        {# Initial sort: [(article.name,asc)] #}
         data-sortlist="[[0,0]]">
       <thead>
         <tr>