';
-
-$var=true;
-
/*
* Last modified members
*/
@@ -295,10 +291,8 @@ if ($resql)
if ($num)
{
$i = 0;
- $var = True;
while ($i < $num)
{
-
$obj = $db->fetch_object($resql);
print '
';
$staticmember->id=$obj->rowid;
@@ -358,10 +352,8 @@ if ($resql)
if ($num)
{
$i = 0;
- $var = True;
while ($i < $num)
{
-
$obj = $db->fetch_object($resql);
print '
';
$subscriptionstatic->id=$obj->cid;
@@ -407,7 +399,6 @@ print "
\n";
foreach ($AdherentType as $key => $adhtype)
{
-
print '
';
print '| '.$adhtype->getNomUrl(1, dol_size(32)).' | ';
print ''.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->subscription,0,3).' | ';
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index bd731e771f3..6f896e186bb 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -127,11 +127,9 @@ if (! $foundphy) $data[]=array('label'=>'phy','nb'=>'0','lastdate'=>'');
if (! $foundmor) $data[]=array('label'=>'mor','nb'=>'0','lastdate'=>'');
$oldyear=0;
-$var=true;
foreach ($data as $val)
{
$year = $val['year'];
-
print '
';
print '| '.$memberstatic->getmorphylib($val['label']).' | ';
print ''.$val['nb'].' | ';
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index d2254b4afd6..8e3d0862490 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -291,11 +291,9 @@ if ($mode)
print '
';
$oldyear=0;
- $var=true;
foreach ($data as $val)
{
$year = $val['year'];
-
print '
';
print '| '.$val['label'].' | ';
if ($label2) print ''.$val['label2'].' | ';
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index d1a8e707e43..4126fc6e68c 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -176,15 +176,13 @@ print ''.$langs->trans("AmountAverage").' | ';
print '
';
$oldyear=0;
-$var=true;
foreach ($data as $val)
{
$year = $val['year'];
while ($oldyear > $year+1)
{ // If we have empty year
$oldyear--;
-
- print '
';
+ print '
';
print '| ';
print '';
print $oldyear;
@@ -195,8 +193,7 @@ foreach ($data as $val)
print ' | 0 | ';
print '
';
}
-
- print '
';
+ print '
';
print '| ';
//print '';
print $year;
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index cc7fbef58f5..dc66e080f48 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -821,11 +821,9 @@ if ($rowid > 0)
}
print " |
\n";
- $var=True;
while ($i < $num)
{
$objp = $db->fetch_object($result);
-
print '
';
$subscriptionstatic->ref=$objp->crowid;
$subscriptionstatic->id=$objp->crowid;
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 164c921d766..ab6bfcc0704 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -206,11 +206,9 @@ if (! $rowid && $action != 'create' && $action != 'edit')
print '| | ';
print "
\n";
- $var=True;
while ($i < $num)
{
$objp = $db->fetch_object($result);
-
print '
';
print '| '.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.' | ';
print ''.dol_escape_htmltag($objp->libelle).' | ';
@@ -518,7 +516,6 @@ if ($rowid > 0)
print "
\n";
- $var=True;
while ($i < $num && $i < $conf->liste_limit)
{
$objp = $db->fetch_object($resql);
@@ -530,7 +527,6 @@ if ($rowid > 0)
$adh->firstname=$objp->firstname;
// Lastname
-
print '
';
if ($objp->societe != '')
{
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 3489860e1dd..46c6a55cf2f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -7,7 +7,7 @@
* Copyright (C) 2006 Andre Cianfarani
* Copyright (C) 2008 Raphael Bertrand
* Copyright (C) 2010-2014 Juanjo Menent
- * Copyright (C) 2010-2016 Philippe Grand
+ * Copyright (C) 2010-2017 Philippe Grand
* Copyright (C) 2012-2014 Christophe Battarel
* Copyright (C) 2012 Cedric Salvador
* Copyright (C) 2013 Florian Henry
@@ -3113,21 +3113,21 @@ class Propal extends CommonObject
$line->qty=1;
$line->subprice=100;
$line->price=100;
- $line->tva_tx=19.6;
+ $line->tva_tx=20;
$line->localtax1_tx=0;
$line->localtax2_tx=0;
if ($xnbp == 2)
{
$line->total_ht=50;
- $line->total_ttc=59.8;
- $line->total_tva=9.8;
+ $line->total_ttc=60;
+ $line->total_tva=10;
$line->remise_percent=50;
}
else
{
$line->total_ht=100;
- $line->total_ttc=119.6;
- $line->total_tva=19.6;
+ $line->total_ttc=120;
+ $line->total_tva=20;
$line->remise_percent=00;
}
@@ -3135,6 +3135,7 @@ class Propal extends CommonObject
{
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
+ $line->product_ref='SPECIMEN';
}
$this->lines[$xnbp]=$line;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index e87923beb8c..bf1f993bcdc 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3541,25 +3541,26 @@ class Commande extends CommonOrder
$line->qty=1;
$line->subprice=100;
$line->price=100;
- $line->tva_tx=19.6;
+ $line->tva_tx=20;
if ($xnbp == 2)
{
$line->total_ht=50;
- $line->total_ttc=59.8;
- $line->total_tva=9.8;
+ $line->total_ttc=60;
+ $line->total_tva=10;
$line->remise_percent=50;
}
else
{
$line->total_ht=100;
- $line->total_ttc=119.6;
- $line->total_tva=19.6;
+ $line->total_ttc=120;
+ $line->total_tva=20;
$line->remise_percent=0;
}
if ($num_prods > 0)
{
$prodid = mt_rand(1, $num_prods);
$line->fk_product=$prodids[$prodid];
+ $line->product_ref='SPECIMEN';
}
$this->lines[$xnbp]=$line;