Merge branch 'master' into aureplop/cof-tests_calendar

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>