Merge branch 'dev'

backend/web/css/screen.css

@@ -1992,35 +1992,36 @@ termes.
 /* line 173, ../sass/distribution/_index.scss */
 .distribution-index #modal-products table.table td.quantity-max input {
   text-align: center;
+  min-width: 50px;
 }
-/* line 180, ../sass/distribution/_index.scss */
+/* line 181, ../sass/distribution/_index.scss */
 .distribution-index #orders {
   position: relative;
 }
-/* line 185, ../sass/distribution/_index.scss */
+/* line 186, ../sass/distribution/_index.scss */
 .distribution-index #orders .panel-heading .buttons .btn {
   position: relative;
   top: -19px;
   float: right;
   margin-left: 10px;
 }
-/* line 194, ../sass/distribution/_index.scss */
+/* line 195, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale {
   margin-bottom: 10px;
 }
-/* line 197, ../sass/distribution/_index.scss */
+/* line 198, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale {
   margin: 0px;
   padding: 0px;
   list-style-type: none;
 }
-/* line 202, ../sass/distribution/_index.scss */
+/* line 203, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li {
   float: left;
   margin-right: 10px;
   margin-bottom: 10px;
 }
-/* line 208, ../sass/distribution/_index.scss */
+/* line 209, ../sass/distribution/_index.scss */
 .distribution-index #orders #wrapper-nav-points-sale ul#nav-points-sale li a .label {
   background-color: white;
   border: solid 1px #e0e0e0;
@@ -2028,7 +2029,7 @@ termes.
   -webkit-border-radius: 10px;
   border-radius: 10px;
 }
-/* line 219, ../sass/distribution/_index.scss */
+/* line 220, ../sass/distribution/_index.scss */
 .distribution-index #orders #buttons-top-orders {
   background-color: #F5F5F5;
   padding: 10px 20px;
@@ -2038,19 +2039,19 @@ termes.
   border-radius: 5px;
   margin-bottom: 20px;
 }
-/* line 230, ../sass/distribution/_index.scss */
+/* line 231, ../sass/distribution/_index.scss */
 .distribution-index #orders #buttons-top-orders .right {
   float: right;
 }
-/* line 234, ../sass/distribution/_index.scss */
+/* line 235, ../sass/distribution/_index.scss */
 .distribution-index #orders #buttons-top-orders .dropdown {
   display: inline-block;
 }
-/* line 241, ../sass/distribution/_index.scss */
+/* line 242, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.tiller {
   width: 60px;
 }
-/* line 244, ../sass/distribution/_index.scss */
+/* line 245, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.tiller label {
   font-size: 12px;
   cursor: pointer;
@@ -2058,68 +2059,68 @@ termes.
   top: -2px;
   font-weight: normal;
 }
-/* line 253, ../sass/distribution/_index.scss */
+/* line 254, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions {
   position: relative;
   text-align: right;
 }
-/* line 257, ../sass/distribution/_index.scss */
+/* line 258, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .dropdown-menu {
   top: 0px;
   right: 0px;
 }
-/* line 262, ../sass/distribution/_index.scss */
+/* line 263, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .modal-form-order,
 .distribution-index #orders table td.column-actions .modal-payment {
   text-align: left;
 }
-/* line 267, ../sass/distribution/_index.scss */
+/* line 268, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .add-subscription {
   position: relative;
 }
-/* line 270, ../sass/distribution/_index.scss */
+/* line 271, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-actions .add-subscription .glyphicon-plus {
   position: absolute;
   top: 4px;
   right: 4px;
   font-size: 7px;
 }
-/* line 279, ../sass/distribution/_index.scss */
+/* line 280, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-state-payment {
   width: 120px;
 }
-/* line 284, ../sass/distribution/_index.scss */
+/* line 285, ../sass/distribution/_index.scss */
 .distribution-index #orders table td.column-payment div.btn-group {
   width: 125px;
 }
-/* line 290, ../sass/distribution/_index.scss */
+/* line 291, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view ul {
   list-style-type: none;
   margin-left: 0px;
   padding-left: 15px;
 }
-/* line 300, ../sass/distribution/_index.scss */
+/* line 301, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .comment {
   margin-top: 20px;
 }
-/* line 304, ../sass/distribution/_index.scss */
+/* line 305, ../sass/distribution/_index.scss */
 .distribution-index #orders table tr.view .delivery {
   margin-top: 20px;
 }
-/* line 313, ../sass/distribution/_index.scss */
+/* line 314, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container {
   width: 100%;
   padding: 0px;
 }
-/* line 317, ../sass/distribution/_index.scss */
+/* line 318, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-body {
   padding-right: 15px;
 }
-/* line 319, ../sass/distribution/_index.scss */
+/* line 320, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-body table {
   margin-bottom: 150px;
 }
-/* line 324, ../sass/distribution/_index.scss */
+/* line 325, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer {
   border-top-color: #f4f4f4;
   position: fixed;
@@ -2131,46 +2132,46 @@ termes.
   text-align: center;
   border-top: solid 1px #e0e0e0;
 }
-/* line 336, ../sass/distribution/_index.scss */
+/* line 337, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .modal-container .modal-footer .actions-form button {
   float: none;
 }
-/* line 343, ../sass/distribution/_index.scss */
+/* line 344, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .btn-credit {
   float: right;
 }
-/* line 349, ../sass/distribution/_index.scss */
+/* line 350, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered td {
   background-color: #e9e9e9;
 }
-/* line 353, ../sass/distribution/_index.scss */
+/* line 354, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products .product-ordered input {
   font-size: 16px;
   font-weight: bold;
 }
-/* line 359, ../sass/distribution/_index.scss */
+/* line 360, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price {
   width: 150px;
 }
-/* line 361, ../sass/distribution/_index.scss */
+/* line 362, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.price input {
   text-align: center;
 }
-/* line 366, ../sass/distribution/_index.scss */
+/* line 367, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity {
   width: 165px;
 }
-/* line 369, ../sass/distribution/_index.scss */
+/* line 370, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity input {
   text-align: center;
   color: black;
 }
-/* line 374, ../sass/distribution/_index.scss */
+/* line 375, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .form-control {
   border-right: 0px none;
   padding-right: 4px;
 }
-/* line 379, ../sass/distribution/_index.scss */
+/* line 380, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity .input-group-addon {
   padding: 5px;
   padding-left: 0px;
@@ -2178,35 +2179,35 @@ termes.
   border-left: 0px none;
   border-right: 0px none;
 }
-/* line 388, ../sass/distribution/_index.scss */
+/* line 389, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining {
   text-align: right;
 }
-/* line 391, ../sass/distribution/_index.scss */
+/* line 392, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.quantity-remaining, .distribution-index .modal-form-order table.table-products td.quantity-remaining.infinite {
   color: #00A65A;
 }
-/* line 395, ../sass/distribution/_index.scss */
+/* line 396, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.negative {
   color: #DD4B39;
 }
-/* line 399, ../sass/distribution/_index.scss */
+/* line 400, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order table.table-products td.quantity-remaining.infinite, .distribution-index .modal-form-order table.table-products td.quantity-remaining.empty {
   font-size: 18px;
 }
-/* line 406, ../sass/distribution/_index.scss */
+/* line 407, ../sass/distribution/_index.scss */
 .distribution-index .modal-form-order .actions-form button {
   margin-left: 15px;
 }
-/* line 414, ../sass/distribution/_index.scss */
+/* line 415, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon {
   width: 50px;
 }
-/* line 417, ../sass/distribution/_index.scss */
+/* line 418, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-icon i {
   font-size: 30px;
 }
-/* line 422, ../sass/distribution/_index.scss */
+/* line 423, ../sass/distribution/_index.scss */
 .distribution-index .modal-payment .info-box .info-box-content {
   margin-left: 50px;
 }

backend/web/sass/distribution/_index.scss

@@ -172,6 +172,7 @@ termes.
 
                                 input {
                                         text-align: center;
+                                        min-width: 50px; 
                                 }
                         }
                 }