diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index d1d21dc1e..3be38c9c9 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -303,7 +303,7 @@ form#product_form h4 { font-size:18px; font-weight:normal;} .sidebar ul.categorieList li:first-child { border-top:none;} .sidebar ul.categorieList li a {color:#3a6ea7; display:block; padding-left:5px;} .sidebar ul.categorieList li a:hover { background-color: #EBEDF4;} -.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;} +.sidebar ul.categorieList li div.categorieWidth { overflow:hidden;} .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;} .sidebar .categorieStatus { display:none;} diff --git a/admin-dev/themes/default/css/modules.css b/admin-dev/themes/default/css/modules.css index 589db9aad..f39e5bc6a 100644 --- a/admin-dev/themes/default/css/modules.css +++ b/admin-dev/themes/default/css/modules.css @@ -213,7 +213,7 @@ form#product, form#access_form{ background-color:#ebedf4; border:1px solid #cc .sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;} .sidebar ul.categorieList li:first-child { border-top:none;} .sidebar ul.categorieList li a {color:#3a6ea7;} -.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;} +.sidebar ul.categorieList li div.categorieWidth { text-indent:5px; overflow:hidden;} .sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;} /*MODULECONTAINER*/ diff --git a/admin-dev/themes/default/img/icon-multishop.png b/admin-dev/themes/default/img/icon-multishop.png index 95f6a238c..b5d46684e 100644 Binary files a/admin-dev/themes/default/img/icon-multishop.png and b/admin-dev/themes/default/img/icon-multishop.png differ diff --git a/admin-dev/themes/default/template/controllers/orders/form.tpl b/admin-dev/themes/default/template/controllers/orders/form.tpl index 1bd4e7ab8..5c58641e3 100755 --- a/admin-dev/themes/default/template/controllers/orders/form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/form.tpl @@ -1031,8 +1031,8 @@
  • {l s='Total products:'}
  • {l s='Total vouchers:'}
  • {l s='Total shipping:'}
  • -
  • {l s='Total without taxes:'}
  • {l s='Total taxes:'}
  • +
  • {l s='Total without taxes:'}
  • {l s='Total with taxes:'}
  • diff --git a/translations/fr/admin.php b/translations/fr/admin.php index 00a9b5c70..e29a3a873 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -3762,10 +3762,10 @@ $_LANGADM['AdminOrders107ca6f108ab1c0c66015df0f61845a9'] = 'Emballage recyclé'; $_LANGADM['AdminOrders0d9175fe89fb80d815e7d03698b6e83a'] = 'Cadeau'; $_LANGADM['AdminOrdersbb45670bfc1611e057b9569c1fdf8003'] = 'Message de l\'emballage cadeau'; $_LANGADM['AdminOrders290612199861c31d1036b185b4e69b75'] = 'Récapitulatif'; -$_LANGADM['AdminOrders543ae6adeb524f98cc7d3c816a1ec1e3'] = 'Total produits :'; +$_LANGADM['AdminOrders543ae6adeb524f98cc7d3c816a1ec1e3'] = 'Total des ventes HT :'; $_LANGADM['AdminOrders2633d6725607d13e80f5e30514b91fbe'] = 'Total bons d\'achat :'; -$_LANGADM['AdminOrders691b338fa68b3c177c6ebbc745624c6a'] = 'Total livraison :'; -$_LANGADM['AdminOrders642da3565243a1a88ce2856d7b26287c'] = 'Total sans les taxes :'; +$_LANGADM['AdminOrders691b338fa68b3c177c6ebbc745624c6a'] = 'Total livraison HT :'; +$_LANGADM['AdminOrders642da3565243a1a88ce2856d7b26287c'] = 'Total HT :'; $_LANGADM['AdminOrdersabbf10987248e3f9f4722d7354fac687'] = 'Total taxes : '; $_LANGADM['AdminOrders0a9ed0867d12a9df60d2b37fd0229b87'] = 'Total taxe comprise :'; $_LANGADM['AdminOrdersae3ccb7e10314703d4d390c3010c71db'] = 'Message pour la commande :';