Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correction on 3.6beta #1669

Merged
merged 4 commits into from
Jun 20, 2014
Merged

Correction on 3.6beta #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e469755
Divers
aspangaro Jun 16, 2014
a974fa4
Merge branch 'Upstream/develop'
aspangaro Jun 17, 2014
736561e
Shop - Bad language file ("boutique" instead of "shop") & add languag…
aspangaro Jun 17, 2014
516363f
Bank - Enhance readability
aspangaro Jun 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 8 additions & 10 deletions htdocs/boutique/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),"");

Expand All @@ -39,10 +39,8 @@


/*
/* Chiffre d'affaires
* Turnover
*/
//print_barre_liste("Chiffre d'affaires", $page, "ca.php");

print_titre($langs->trans('SalesTurnover'));

print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ";
Expand Down Expand Up @@ -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 ";
Expand Down Expand Up @@ -202,7 +200,7 @@

print '</td></tr><tr>';
/*
* 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 ";
Expand Down
4 changes: 2 additions & 2 deletions htdocs/boutique/osc_master.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/


Expand All @@ -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 '<div class="error">Failed to connect to oscommerce database. Check your module setup</div>';
print '<div class="error">'.$langs->trans('FailedConnectDBCheckModuleSetup').'</div>';
llxFooter();
exit;
}
Expand Down
3 changes: 2 additions & 1 deletion htdocs/categories/admin/categorie.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@

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();
Expand Down
14 changes: 7 additions & 7 deletions htdocs/compta/bank/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,13 @@
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)
*/
print '<table class="liste" width="100%">';
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" width="100">&nbsp;</td>';
Expand Down Expand Up @@ -181,19 +182,18 @@
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 placements (courant = 0)
*/
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print '<td width="30%">'.$langs->trans("SavingAccounts").'</td>';
print '<td width="20%">'.$langs->trans("Bank").'</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="right" width="100">'.$langs->trans("BankBalance").'</td>';
print "</tr>\n";
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/modules/modLabel.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
1 change: 1 addition & 0 deletions htdocs/langs/en_US/shop.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions htdocs/langs/fr_FR/shop.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down