lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Divers

Browse Source
This commit is contained in:
aspangaro 2014-06-16 06:17:46 +02:00
parent e6d407d418
commit e469755d29
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/boutique/index.php
View File

@ -19,7 +19,7 @@
/** /**
* \file htdocs/boutique/index.php * \file htdocs/boutique/index.php
* \ingroup boutique * \ingroup boutique
* \brief Page accueil zone boutique * \brief Main page of shop zone
*/ */
require '../main.inc.php'; require '../main.inc.php';
@ -39,10 +39,8 @@ print '<tr><td valign="top" width="40%" class="notopnoleft">';
/* /*
/* Chiffre d'affaires * Turnover
*/ */
//print_barre_liste("Chiffre d'affaires", $page, "ca.php");
print_titre($langs->trans('SalesTurnover')); print_titre($langs->trans('SalesTurnover'));
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">'; print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
@ -92,7 +90,7 @@ print '</td><td valign="top" width="60%" class="notopnoleftnoright">';
print_titre($langs->trans("Orders")); 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 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 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 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<EFBFBD>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 = "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 "; $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 <EFBFBD> traiter * Commands to treat
*/ */
$sql = "SELECT o.orders_id, o.customers_name, o.date_purchased, t.value, o.payment_method"; $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 "; $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 '</td></tr><tr>'; print '</td></tr><tr>';
/* /*
* Derniers clients qui ont command<EFBFBD> * 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 = "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 "; $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 ";

2
htdocs/boutique/osc_master.inc.php
View File

@ -17,7 +17,7 @@
/** /**
* \file htdocs/boutique/osc_master.inc.php * \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
*/ */

3
htdocs/categories/admin/categorie.php
View File

@ -75,7 +75,8 @@ $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToM
llxHeader('',$langs->trans("Categories"),$help_url); llxHeader('',$langs->trans("Categories"),$help_url);
print_fiche_titre($langs->trans("CategoriesSetup"),'','setup'); $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print_fiche_titre($langs->trans("CategoriesSetup"),$linkback,'setup');
$head=categoriesadmin_prepare_head(); $head=categoriesadmin_prepare_head();

2
htdocs/core/modules/modLabel.class.php
View File

@ -60,7 +60,7 @@ class modLabel extends DolibarrModules
$this->requiredby = array(); $this->requiredby = array();
// Config pages // Config pages
$this->config_page_url = array("label.php"); // $this->config_page_url = array("label.php");
// Constants // Constants
$this->const = array(); $this->const = array();