diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php
index 97d61a5353f34..040e81b726a3f 100644
--- a/htdocs/boutique/index.php
+++ b/htdocs/boutique/index.php
@@ -19,15 +19,15 @@
/**
* \file htdocs/boutique/index.php
* \ingroup boutique
- * \brief Page accueil zone boutique
+ * \brief Main page of shop zone
*/
require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
-$langs->load("boutique");
+$langs->load("shop");
$langs->load("orders");
+require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
llxHeader("",$langs->trans("OSCommerceShop"),"");
@@ -39,10 +39,8 @@
/*
- /* Chiffre d'affaires
+ * Turnover
*/
-//print_barre_liste("Chiffre d'affaires", $page, "ca.php");
-
print_titre($langs->trans('SalesTurnover'));
print '
';
@@ -92,7 +90,7 @@
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 @@
}
/*
- * 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 @@
}
/*
- * 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 @@
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 ab4c0cf701a92..057c15f30e1ac 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
*/
@@ -31,7 +31,7 @@
dol_syslog($dbosc,"host=".$conf->global->OSC_DB_HOST.", user=".$conf->global->OSC_DB_USER.", databasename=".$conf->global->OSC_DB_NAME.", ".$db->error,LOG_ERR);
llxHeader("",$langs->trans("OSCommerceShop"),"");
- print 'Failed to connect to oscommerce database. Check your module setup
';
+ print ''.$langs->trans('FailedConnectDBCheckModuleSetup').'
';
llxFooter();
exit;
}
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 53d1d55eddd83..5301b7986e0fb 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -75,7 +75,8 @@
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/compta/bank/index.php b/htdocs/compta/bank/index.php
index e98d8978440a8..c9b70e9425768 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -133,12 +133,13 @@
print '
'.$langs->trans("Total ").$key.' | '.price($solde, 0, $langs, 0, 0, -1, $key).' |
';
}
-//print ' |
';
-
+print '
';
+print '
';
/*
* Comptes caisse/liquide (courant = 2)
*/
+print '';
print ''.$langs->trans("CashAccounts").' | | ';
print ' | ';
print ' | ';
@@ -181,19 +182,18 @@
print '
'.$langs->trans("Total ").$key.' | '.price($solde, 0, $langs, 0, 0, -1, $key).' |
';
}
-
-
-//print ' |
';
-
+print '
';
+print '
';
/*
* Comptes placements (courant = 0)
*/
+print '';
print '';
print ''.$langs->trans("SavingAccounts").' | ';
print ''.$langs->trans("Bank").' | ';
print ''.$langs->trans("Numero").' | ';
-print ''.$langs->trans("TransactionsToConciliate").' | ';
+print ''.$langs->trans("TransactionsToConciliate").' | ';
print ''.$langs->trans("Status").' | ';
print ''.$langs->trans("BankBalance").' | ';
print "
\n";
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index a5e8e42400876..9519c63fb95df 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -60,7 +60,7 @@ function __construct($db)
$this->requiredby = array();
// Config pages
- $this->config_page_url = array("label.php");
+ // $this->config_page_url = array("label.php");
// Constants
$this->const = array();
diff --git a/htdocs/langs/en_US/shop.lang b/htdocs/langs/en_US/shop.lang
index d648f03f35026..156af426bb055 100644
--- a/htdocs/langs/en_US/shop.lang
+++ b/htdocs/langs/en_US/shop.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - shop
+FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
Shop=Shop
ShopWeb=Web Shop
LastOrders=Last orders
diff --git a/htdocs/langs/fr_FR/shop.lang b/htdocs/langs/fr_FR/shop.lang
index f82a1853e10a8..0e82e27ce3d0c 100644
--- a/htdocs/langs/fr_FR/shop.lang
+++ b/htdocs/langs/fr_FR/shop.lang
@@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - shop
+FailedConnectDBCheckModuleSetup=Erreur de connexion à la base de données oscommerce. Vérifier la configuration du module
Shop=Boutique
ShopWeb=Boutique Web
LastOrders=Dernières commandes