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

anglicizing

Browse Source
This commit is contained in:
Grand Philippe 2014-04-08 14:05:10 +02:00
parent 9dd499b133
commit 9a056ab497
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/product/index.php
View File

@ -20,7 +20,7 @@
/** /**
* \file htdocs/product/index.php * \file htdocs/product/index.php
* \ingroup product * \ingroup product
* \brief Page accueil des produits et services * \brief Homepage products and services
*/ */
require '../main.inc.php'; 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"]:''); $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->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 // Security check
if ($type=='0') $result=restrictedArea($user,'produit'); 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; $rowspan=2;
if (! empty($conf->barcode->enabled)) $rowspan++; 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 = array();
$prodser[0][0]=$prodser[0][1]=$prodser[1][0]=$prodser[1][1]=0; $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; 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")); $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 = "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.= " 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"; $sql.= " , ".MAIN_DB_PREFIX."paiement as p,".MAIN_DB_PREFIX."paiement_facture as pf";
@ -346,7 +346,7 @@ function activitytrim($product_type)
print '</tr>'; print '</tr>';
$lgn++; $lgn++;
} }
// on passe à l'année suivante // We go to the following year
$tmpyear = $objp->annee; $tmpyear = $objp->annee;
$trim1=0; $trim1=0;
$trim2=0; $trim2=0;