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

Merge pull request #1669 from aspangaro/develop-patch1

Browse Source 
Correction on 3.6beta
This commit is contained in:
Laurent Destailleur 2014-06-20 13:12:39 +02:00
commit 51eb761b02
7 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/boutique/index.php
View File

@ -19,15 +19,15 @@
/** /**
* \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';
require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
$langs->load("boutique"); $langs->load("shop");
$langs->load("orders"); $langs->load("orders");
require_once DOL_DOCUMENT_ROOT.'/boutique/osc_master.inc.php';
llxHeader("",$langs->trans("OSCommerceShop"),""); llxHeader("",$langs->trans("OSCommerceShop"),"");
@ -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 ";

4
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
*/ */
@ -31,7 +31,7 @@ if (! $dbosc->connected)
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); 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"),""); llxHeader("",$langs->trans("OSCommerceShop"),"");
print '<div class="error">Failed to connect to oscommerce database. Check your module setup</div>'; print '<div class="error">'.$langs->trans('FailedConnectDBCheckModuleSetup').'</div>';
llxFooter(); llxFooter();
exit; exit;
} }

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();

14
htdocs/compta/bank/index.php
View File

@ -133,12 +133,13 @@ foreach ($total as $key=>$solde)
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>'; print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
} }
//print '<tr><td colspan="5">&nbsp;</td></tr>'; print '</table>';
print '<br>';
/* /*
* Comptes caisse/liquide (courant = 2) * Comptes caisse/liquide (courant = 2)
*/ */
print '<table class="liste" width="100%">';
print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CashAccounts").'</td><td width="20%">&nbsp;</td>'; print '<tr class="liste_titre"><td width="30%">'.$langs->trans("CashAccounts").'</td><td width="20%">&nbsp;</td>';
print '<td align="left">&nbsp;</td>'; print '<td align="left">&nbsp;</td>';
print '<td align="left" width="100">&nbsp;</td>'; print '<td align="left" width="100">&nbsp;</td>';
@ -181,19 +182,18 @@ foreach ($total as $key=>$solde)
print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>'; print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total ").$key.'</td><td align="right" class="liste_total">'.price($solde, 0, $langs, 0, 0, -1, $key).'</td></tr>';
} }
print '</table>';
print '<br>';
//print '<tr><td colspan="5">&nbsp;</td></tr>';
/* /*
* Comptes placements (courant = 0) * Comptes placements (courant = 0)
*/ */
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans("SavingAccounts").'</td>'; print '<td width="30%">'.$langs->trans("SavingAccounts").'</td>';
print '<td width="20%">'.$langs->trans("Bank").'</td>'; print '<td width="20%">'.$langs->trans("Bank").'</td>';
print '<td align="left">'.$langs->trans("Numero").'</td>'; print '<td align="left">'.$langs->trans("Numero").'</td>';
print '<td align="center" width="100">'.$langs->trans("TransactionsToConciliate").'</td>'; print '<td align="center">'.$langs->trans("TransactionsToConciliate").'</td>';
print '<td align="center" width="70">'.$langs->trans("Status").'</td>'; print '<td align="center" width="70">'.$langs->trans("Status").'</td>';
print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>'; print '<td align="right" width="100">'.$langs->trans("BankBalance").'</td>';
print "</tr>\n"; print "</tr>\n";

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();

1
htdocs/langs/en_US/shop.lang
View File

@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - shop # Dolibarr language file - Source file is en_US - shop
FailedConnectDBCheckModuleSetup=Failed to connect to oscommerce database. Check your module setup
Shop=Shop Shop=Shop
ShopWeb=Web Shop ShopWeb=Web Shop
LastOrders=Last orders LastOrders=Last orders

1
htdocs/langs/fr_FR/shop.lang
View File

@ -1,4 +1,5 @@
# Dolibarr language file - Source file is en_US - shop # 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 Shop=Boutique
ShopWeb=Boutique Web ShopWeb=Boutique Web
LastOrders=Dernières commandes LastOrders=Dernières commandes