';
print '| '.$langs->trans("HideUnauthorizedMenu").' | ';
print '';
diff --git a/htdocs/admin/system/browser.php b/htdocs/admin/system/browser.php
index 4051392c82c..4f2a53de88d 100644
--- a/htdocs/admin/system/browser.php
+++ b/htdocs/admin/system/browser.php
@@ -47,25 +47,16 @@ print load_fiche_titre($langs->trans("InfoBrowser"),'','title_setup');
$tmp=getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
// Browser
-$var=true;
print '';
print ' ';
print '| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' | '."\n";
-
print '| '.$langs->trans("UserAgent").' | '.$_SERVER['HTTP_USER_AGENT'].' | '."\n";
-
print '| '.$langs->trans("BrowserName").' | '.$tmp['browsername'].' | '."\n";
-
print '| '.$langs->trans("BrowserOS").' | '.$tmp['browseros'].' | '."\n";
-
print '| '.$langs->trans("Version").' | '.$tmp['browserversion'].' | '."\n";
-
print '| '.$langs->trans("Layout").' (phone/tablet/classic) | '.$tmp['layout'].' | '."\n";
-
print '| '.$langs->trans("IPAddress").' | '.$_SERVER['REMOTE_ADDR'].' | '."\n";
-
print '| '.$langs->trans("SessionName").' | '.session_name().' | '."\n";
-
print '| '.$langs->trans("SessionId").' | '.session_id().' | '."\n";
print '| '.$langs->trans("Screen").' | ';
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 9590260f005..c7c7542ccaa 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -170,7 +170,6 @@ foreach($configfileparameters as $key)
continue;
}
-
print ' | ';
if ($newkey == 'separator')
{
@@ -233,12 +232,10 @@ if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
- $var=True;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
-
print ' ';
print '| '.$obj->name.' | '."\n";
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 1e70cbab6cc..556961cb565 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -103,12 +103,10 @@ else
if ($resql)
{
$num = $db->num_rows($resql);
- $var=True;
$i=0;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
-
print ' ';
print '| '.$obj->Name.' | ';
@@ -158,12 +156,10 @@ else
if ($resql)
{
$num = $db->num_rows($resql);
- $var=True;
$i=0;
while ($i < $num)
{
$row = $db->fetch_row($resql);
-
print ' ';
print '| '.$row[0].' | ';
print ''.$row[1].' | ';
@@ -182,8 +178,8 @@ else
if ($base == 4)
{
// Sqlite by PDO or by Sqlite3
- print '';
- print ' ';
+ print '';
+ print ' ';
print '';
print '| '.$langs->trans("TableName").' | ';
print ''.$langs->trans("NbOfRecord").' | ';
@@ -194,7 +190,6 @@ else
if ($resql)
{
- $var=True;
while ($row = $db->fetch_row($resql)) {
$rescount = $db->query("SELECT COUNT(*) FROM " . $row[0]);
diff --git a/htdocs/admin/system/database.php b/htdocs/admin/system/database.php
index 39511e8a814..45ce3c087e6 100644
--- a/htdocs/admin/system/database.php
+++ b/htdocs/admin/system/database.php
@@ -100,10 +100,8 @@ else
if ($listname == 'listofvars') $listtouse=$listofvars;
if ($listname == 'listofstatus') $listtouse=$listofstatus;
- $var=true;
foreach($listtouse as $param => $paramval)
{
-
print ' ';
print '| ';
print $param;
diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php
index 624edc2f38e..19fa3fc1abd 100644
--- a/htdocs/admin/system/dbtable.php
+++ b/htdocs/admin/system/dbtable.php
@@ -106,14 +106,11 @@ else
if ($resql)
{
$num = $db->num_rows($resql);
- $var=True;
$i=0;
while ($i < $num)
{
$row = $db->fetch_row($resql);
-
print ' | ';
-
print "| $row[0] | ";
print "$row[1] | ";
print "$row[3] | ";
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index c96a085456a..36260c0a228 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -68,11 +68,9 @@ llxHeader('', $title);
print load_fiche_titre($title,'','title_setup');
// Version
-$var=true;
print '';
print ' ';
print '| '.$langs->trans("Version").' | '.$langs->trans("Value").' | '."\n";
-
print '| '.$langs->trans("CurrentVersion").' ('.$langs->trans("Programs").') | '.DOL_VERSION;
// If current version differs from last upgrade
if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE))
@@ -123,41 +121,30 @@ if (function_exists('curl_init'))
}
print ' | '."\n";
-
print '| '.$langs->trans("VersionLastUpgrade").' ('.$langs->trans("Database").') | '.$conf->global->MAIN_VERSION_LAST_UPGRADE.' | '."\n";
-
print '| '.$langs->trans("VersionLastInstall").' | '.$conf->global->MAIN_VERSION_LAST_INSTALL.' | '."\n";
print ' ';
print '
';
// Session
-$var=true;
print '';
print ' ';
print '| '.$langs->trans("Session").' | '.$langs->trans("Value").' | '."\n";
-
print '| '.$langs->trans("SessionSavePath").' | '.session_save_path().' | '."\n";
-
print '| '.$langs->trans("SessionName").' | '.session_name().' | '."\n";
-
print '| '.$langs->trans("SessionId").' | '.session_id().' | '."\n";
-
print '| '.$langs->trans("CurrentSessionTimeOut").' | '.ini_get('session.gc_maxlifetime').' '.$langs->trans("seconds");
print ' | ';
print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor")));
print " | \n";
-
print '| '.$langs->trans("CurrentTheme").' | '.$conf->theme.' | '."\n";
-
print '| '.$langs->trans("CurrentMenuHandler").' | ';
print $conf->standard_menu;
print ' | '."\n";
-
print '| '.$langs->trans("Screen").' | ';
print $_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
print ' | '."\n";
-
print '| '.$langs->trans("Session").' | ';
$i=0;
foreach($_SESSION as $key => $val)
@@ -177,7 +164,6 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
{
$shmoparray=dol_listshmop();
- $var=true;
print '';
print ' ';
print '';
@@ -188,7 +174,6 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
foreach($shmoparray as $key => $val)
{
-
print ' | '.$key.' | ';
print ''.count($val).' | ';
print ''.dol_getshmopaddress($key).' | ';
@@ -202,43 +187,33 @@ if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_S
// Localisation
-$var=true;
print '';
print ' ';
print '| '.$langs->trans("LocalisationDolibarrParameters").' | '.$langs->trans("Value").' | '."\n";
-
print '| '.$langs->trans("LanguageBrowserParameter","HTTP_ACCEPT_LANGUAGE").' | '.$_SERVER["HTTP_ACCEPT_LANGUAGE"].' | '."\n";
-
print '| '.$langs->trans("CurrentUserLanguage").' | '.$langs->getDefaultLang().' | '."\n";
// Thousands
-
$thousand=$langs->transnoentitiesnoconv("SeparatorThousand");
if ($thousand == 'SeparatorThousand') $thousand=' '; // ' ' does not work on trans method
if ($thousand == 'None') $thousand='';
print '| '.$langs->trans("CurrentValueSeparatorThousand").' | '.($thousand==' '?$langs->transnoentitiesnoconv("Space"):$thousand).' | '."\n";
// Decimals
-
$dec=$langs->transnoentitiesnoconv("SeparatorDecimal");
print '| '.$langs->trans("CurrentValueSeparatorDecimal").' | '.$dec.' | '."\n";
// Show results of functions to see if everything works
-
print '| => price2num(1233.56+1) | '.price2num(1233.56+1,'2').' | '."\n";
-
-print "| => price2num('."'1".$thousand."234".$dec."56') | ".price2num("1".$thousand."234".$dec."56",'2')." | \n";
+print '| => price2num('."'1".$thousand."234".$dec."56') | ".price2num("1".$thousand."234".$dec."56",'2')." | \n";
if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
{
-
- print "| => price2num('."'1 234.56') | ".price2num("1 234.56",'2')." | ";
+ print ' | => price2num('."'1 234.56') | ".price2num("1 234.56",'2')." | ";
print " \n";
}
-
print '| => price(1234.56) | '.price(1234.56).' | '."\n";
// Timezone
$txt =$langs->trans("OSTZ").' (variable system TZ): '.(! empty($_ENV["TZ"])?$_ENV["TZ"]:$langs->trans("NotDefined")).'
'."\n";
$txt.=$langs->trans("PHPTZ").' (php.ini date.timezone): '.(ini_get("date.timezone")?ini_get("date.timezone"):$langs->trans("NotDefined")).''."
\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
$txt.=$langs->trans("Dolibarr constant MAIN_SERVER_TZ").': '.(empty($conf->global->MAIN_SERVER_TZ)?$langs->trans("NotDefined"):$conf->global->MAIN_SERVER_TZ);
//$txt.=$langs->trans("YouCanEditPHPTZ"); // deprecated
-
print '| '.$langs->trans("CurrentTimeZone").' | '; // Timezone server PHP
$a=getServerTimeZoneInt('now');
$b=getServerTimeZoneInt('winter');
@@ -251,18 +226,13 @@ $val.=' '.getServerTimeZoneString();
$val.=' '.$langs->trans("DaylingSavingTime").': '.($daylight==='unknown'?'unknown':($a==$c?yn($daylight):yn(0).($daylight?' ('.$langs->trans('YesInSummer').')':'')));
print $form->textwithtooltip($val,$txt,2,1,img_info(''));
print ' | '."\n"; // value defined in http://fr3.php.net/manual/en/timezones.europe.php
-
print '| => '.$langs->trans("CurrentHour").' | '.dol_print_date(dol_now(),'dayhour','tzserver').' | '."\n";
-
print '| => dol_print_date(0,"dayhourtext") | '.dol_print_date(0,"dayhourtext").' | ';
-
print ' | => dol_get_first_day(1970,1,false) | '.dol_get_first_day(1970,1,false).' (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,false),'dayhour').') | ';
-
print ' | => dol_get_first_day(1970,1,true) | '.dol_get_first_day(1970,1,true).' (=> dol_print_date() or idate() of this value = '.dol_print_date(dol_get_first_day(1970,1,true),'dayhour').') | ';
// Database timezone
if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
{
-
print ' | '.$langs->trans("MySQLTimeZone").' (database) | '; // Timezone server base
$sql="SHOW VARIABLES where variable_name = 'system_time_zone'";
$resql = $db->query($sql);
@@ -274,7 +244,6 @@ if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli')
print ' | '."\n";
}
// Client
-
$tz=(int) $_SESSION['dol_tz'] + (int) $_SESSION['dol_dst'];
print '| '.$langs->trans("ClientTZ").' | '.($tz?($tz>=0?'+':'').$tz:'').' ('.($tz>=0?'+':'').($tz*60*60).')';
print ' '.$_SESSION['dol_tz_string'];
@@ -284,14 +253,11 @@ else print yn(0);
if (! empty($_SESSION['dol_dst_first'])) print ' ('.dol_print_date(dol_stringtotime($_SESSION['dol_dst_first']),'dayhour','gmt').' - '.dol_print_date(dol_stringtotime($_SESSION['dol_dst_second']),'dayhour','gmt').')';
print ' | '."\n";
print ''."\n";
-
print '| => '.$langs->trans("ClientHour").' | '.dol_print_date(dol_now(),'dayhour','tzuser').' | '."\n";
-
$filesystemencoding=ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0
print '| '.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding) | '.$filesystemencoding.' | '."\n"; // date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
-
$tmp=ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0
if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1'; // By default for windows
if (empty($tmp)) $tmp='utf-8'; // By default for other
@@ -384,7 +350,6 @@ foreach($configfileparameters as $key => $value)
}
if (strpos($newkey, 'separator') !== false && $lastkeyshown == 'separator') continue;
-
print '';
if (strpos($newkey, 'separator') !== false)
{
@@ -463,12 +428,10 @@ if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
- $var=True;
while ($i < $num)
{
$obj = $db->fetch_object($resql);
-
print ' ';
print '| '.$obj->name.' | '."\n";
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index c64379a96f1..4d32e10b174 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -46,14 +46,10 @@ print load_fiche_titre($langs->trans("FileCheckDolibarr"),'','title_setup');
print $langs->trans("FileCheckDesc").'
';
// Version
-$var = true;
print '';
print '| '.$langs->trans("Version").' | '.$langs->trans("Value").' | '."\n";
-$var = ! $var;
print '| '.$langs->trans("VersionLastInstall").' | '.$conf->global->MAIN_VERSION_LAST_INSTALL.' | '."\n";
-$var = ! $var;
print '| '.$langs->trans("VersionLastUpgrade").' | '.$conf->global->MAIN_VERSION_LAST_UPGRADE.' | '."\n";
-$var = ! $var;
print '| '.$langs->trans("VersionProgram").' | '.DOL_VERSION;
// If current version differs from last upgrade
if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) {
@@ -172,7 +168,6 @@ if ($xml)
$out.=' | ' . $langs->trans("ExpectedValue") . ' | ';
$out.='' . $langs->trans("Value") . ' | ';
$out.=' '."\n";
- $var = true;
$i = 0;
foreach ($xml->dolibarr_constants[0]->constant as $constant) // $constant is a simpleXMLElement
@@ -188,8 +183,7 @@ if ($xml)
$checksumconcat[]=$valueforchecksum;
$i++;
- $var = !$var;
- $out.='';
+ $out.=' ';
$out.='| '.$i.' | ' . "\n";
$out.=''.$constname.' | ' . "\n";
$out.=''.$constvalue.' | ' . "\n";
@@ -199,7 +193,7 @@ if ($xml)
if ($i==0)
{
- $out.=' | '.$langs->trans("None").' | ';
+ $out.='| '.$langs->trans("None").' | ';
}
$out.=' ';
@@ -239,7 +233,6 @@ if ($xml)
$out.='' . $langs->trans("Filename") . ' | ';
$out.='' . $langs->trans("ExpectedChecksum") . ' | ';
$out.=' '."\n";
- $var = true;
$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
if (is_array($tmpfilelist) && count($tmpfilelist))
{
@@ -247,8 +240,7 @@ if ($xml)
foreach ($tmpfilelist as $file)
{
$i++;
- $var = !$var;
- $out.='';
+ $out.=' ';
$out.='| '.$i.' | ' . "\n";
$out.=''.$file['filename'].' | ' . "\n";
$out.=''.$file['expectedmd5'].' | ' . "\n";
@@ -257,7 +249,7 @@ if ($xml)
}
else
{
- $out.=' | '.$langs->trans("None").' | ';
+ $out.='| '.$langs->trans("None").' | ';
}
$out.=' ';
@@ -276,7 +268,6 @@ if ($xml)
$out.=' ' . $langs->trans("Size") . ' | ';
$out.=' ' . $langs->trans("DateModification") . ' | ';
$out.=' '."\n";
- $var = true;
$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
if (is_array($tmpfilelist2) && count($tmpfilelist2))
{
@@ -284,8 +275,7 @@ if ($xml)
foreach ($tmpfilelist2 as $file)
{
$i++;
- $var = !$var;
- $out.='';
+ $out.=' ';
$out.='| '.$i.' | ' . "\n";
$out.=''.$file['filename'].' | ' . "\n";
$out.=''.$file['expectedmd5'].' | ' . "\n";
@@ -307,7 +297,7 @@ if ($xml)
}
else
{
- $out.=' | '.$langs->trans("None").' | ';
+ $out.='| '.$langs->trans("None").' | ';
}
$out.=' ';
@@ -326,7 +316,6 @@ if ($xml)
$out.=' ' . $langs->trans("Size") . ' | ';
$out.=' ' . $langs->trans("DateModification") . ' | ';
$out.=' | '."\n";
- $var = true;
$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
if (is_array($tmpfilelist3) && count($tmpfilelist3))
{
@@ -334,8 +323,7 @@ if ($xml)
foreach ($tmpfilelist3 as $file)
{
$i++;
- $var = !$var;
- $out.='';
+ $out.=' ';
$out.='| '.$i.' | ' . "\n";
$out.=''.$file['filename'].' | ' . "\n";
$out.=''.$file['expectedmd5'].' | ' . "\n";
@@ -357,7 +345,7 @@ if ($xml)
}
else
{
- $out.=' | '.$langs->trans("None").' | ';
+ $out.='| '.$langs->trans("None").' | ';
}
$out.=' ';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 68a01340303..4a6967089e2 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -118,9 +118,8 @@ $rights_ids = array();
foreach($sortorder as $numero=>$name)
{
$idperms="";
-
// Module
- print " | ';
+ print ' | | ';
$alt=$name.' - '.$modules_files[$numero];
if (! empty($picto[$numero]))
{
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 6bb431bfdfb..8664a28b28a 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -57,7 +57,7 @@ $var=false;
// Recupere la version de PHP
$phpversion=version_php();
-print " | | '.$langs->trans("Version")." | ".$phpversion." | \n";
+print ' | '.$langs->trans("Version")." | ".$phpversion." | \n";
print ' ';
print ' ';
@@ -76,13 +76,11 @@ foreach($phparray as $key => $value)
print ' '.$langs->trans("Value").' | ';
print "\n";
- $var=true;
//var_dump($value);
foreach($value as $keyparam => $keyvalue)
{
if (! is_array($keyvalue))
{
-
print ' ';
print '| '.$keyparam.' | ';
$valtoshow=$keyvalue;
@@ -97,7 +95,6 @@ foreach($phparray as $key => $value)
}
else
{
-
print ' ';
print '| '.$keyparam.' | ';
$i=0;
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;
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1799fadf9bd..ef162beb750 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -118,7 +118,9 @@ $fieldstosearchall = array(
's.nom'=>"ThirdPartyName",
's.name_alias'=>"AliasNameShort",
's.code_client'=>"CustomerCode",
- "s.code_fournisseur"=>"SupplierCode",
+ 's.code_fournisseur'=>"SupplierCode",
+ 's.code_compta'=>"CustomerAccountancyCodeShort",
+ 's.code_compta_fournisseur'=>"SupplierAccountancyCodeShort",
's.email'=>"EMail",
's.url'=>"URL",
's.tva_intra'=>"VATIntra",
|