Skip to content
Snippets Groups Projects
Commit 9a056ab4 authored by Philippe Grand's avatar Philippe Grand
Browse files

anglicizing

parent 9dd499b1
No related branches found
No related tags found
No related merge requests found
......@@ -20,7 +20,7 @@
/**
* \file htdocs/product/index.php
* \ingroup product
* \brief Page accueil des produits et services
* \brief Homepage products and services
*/
require '../main.inc.php';
......@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
$type=isset($_GET["type"])?$_GET["type"]:(isset($_POST["type"])?$_POST["type"]:'');
if ($type =='' && !$user->rights->produit->lire) $type='1'; // Force global page on service page only
if ($type =='' && !$user->rights->service->lire) $type='0'; // Force global page on prpduct page only
if ($type =='' && !$user->rights->service->lire) $type='0'; // Force global page on product page only
// Security check
if ($type=='0') $result=restrictedArea($user,'produit');
......@@ -74,7 +74,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
/*
* Zone recherche produit/service
* Search Area of product/service
*/
$rowspan=2;
if (! empty($conf->barcode->enabled)) $rowspan++;
......@@ -101,7 +101,7 @@ print "</table></form><br>";
/*
* Nombre de produits et/ou services
* Number of products and/or services
*/
$prodser = array();
$prodser[0][0]=$prodser[0][1]=$prodser[1][0]=$prodser[1][1]=0;
......@@ -284,10 +284,10 @@ function activitytrim($product_type)
{
global $conf,$langs,$db;
// on affiche les 3 dernières années
// We display the last 3 years
$yearofbegindate=date('Y',dol_time_plus_duree(time(), -3, "y"));
// ventilation par trimestre
// breakdown by quarter
$sql = "SELECT DATE_FORMAT(p.datep,'%Y') as annee, DATE_FORMAT(p.datep,'%m') as mois, SUM(fd.total_ht) as Mnttot";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as fd";
$sql.= " , ".MAIN_DB_PREFIX."paiement as p,".MAIN_DB_PREFIX."paiement_facture as pf";
......@@ -346,7 +346,7 @@ function activitytrim($product_type)
print '</tr>';
$lgn++;
}
// on passe à l'année suivante
// We go to the following year
$tmpyear = $objp->annee;
$trim1=0;
$trim2=0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment