diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 97d61a5353f..0aba9cde8c1 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -19,7 +19,7 @@ /** * \file htdocs/boutique/index.php * \ingroup boutique - * \brief Page accueil zone boutique + * \brief Main page of shop zone */ require '../main.inc.php'; @@ -39,10 +39,8 @@ print ''; /* - /* Chiffre d'affaires + * Turnover */ -//print_barre_liste("Chiffre d'affaires", $page, "ca.php"); - print_titre($langs->trans('SalesTurnover')); print ''; @@ -92,7 +90,7 @@ print ''; /* - * Derniers clients qui ont command� + * Last customers who commanded */ $sql = "SELECT o.orders_id, o.customers_name, o.delivery_country, o.date_purchased, t.value, s.orders_status_name as statut"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; diff --git a/htdocs/boutique/osc_master.inc.php b/htdocs/boutique/osc_master.inc.php index ab4c0cf701a..f92e7ba4c5a 100644 --- a/htdocs/boutique/osc_master.inc.php +++ b/htdocs/boutique/osc_master.inc.php @@ -17,7 +17,7 @@ /** * \file htdocs/boutique/osc_master.inc.php - * \brief Fichier de preparation de l'environnement Dolibarr pour OSCommerce + * \brief File of preparation of the environment Dolibarr for OSCommerce */ diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php index 53d1d55eddd..5301b7986e0 100644 --- a/htdocs/categories/admin/categorie.php +++ b/htdocs/categories/admin/categorie.php @@ -75,7 +75,8 @@ $linkback=''.$langs->trans("BackToM llxHeader('',$langs->trans("Categories"),$help_url); -print_fiche_titre($langs->trans("CategoriesSetup"),'','setup'); +$linkback=''.$langs->trans("BackToModuleList").''; +print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'setup'); $head=categoriesadmin_prepare_head(); diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php index a5e8e424008..9519c63fb95 100644 --- a/htdocs/core/modules/modLabel.class.php +++ b/htdocs/core/modules/modLabel.class.php @@ -60,7 +60,7 @@ class modLabel extends DolibarrModules $this->requiredby = array(); // Config pages - $this->config_page_url = array("label.php"); + // $this->config_page_url = array("label.php"); // Constants $this->const = array();
'; print_titre($langs->trans("Orders")); /* - * 5 derniees commandes recues + * Last 5 successful commands select o.orders_id, o.customers_id, o.customers_name, o.date_purchased, o.payement_method, o.status, t.value from orders_total as t join orders as o on o.orders_id = t.orders_id where t.class = 'ot_subtotal' order by o.date_purchased desc @@ -130,7 +128,7 @@ else } /* - * 5 derni�res commandes en attente + * Last 5 commands in wait */ $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; @@ -165,7 +163,7 @@ else } /* - * Commandes � traiter + * Commands to treat */ $sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o on o.orders_id = t.orders_id "; @@ -202,7 +200,7 @@ else print '