| ';
if (! $filter || $filter=='fk_facture_source IS NULL') print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': ';
else print $langs->trans("CompanyHasCreditNote",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': ';
- // print $langs->trans("AvailableGlobalDiscounts").': ';
$newfilter='fk_facture IS NULL AND fk_facture_line IS NULL'; // Remises disponibles
if ($filter) $newfilter.=' AND '.$filter;
- $nbqualifiedlines=$this->select_remises('',$htmlname,$newfilter,$socid,$maxvalue);
+ $nbqualifiedlines=$this->select_remises($selected,$htmlname,$newfilter,$socid,$maxvalue);
print ' | ';
print '';
if ($nbqualifiedlines > 0)
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index a1a452a939d..b76ed8c3724 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -439,12 +439,17 @@ class FormFile
$file_list=dol_dir_list($filedir,'files',0,$filter,'\.meta$'.($png?'|'.$png:''),'date',SORT_DESC);
// Affiche en-tete tableau si non deja affiche
- if (count($file_list) && ! $headershown && !$iconPDF)
+ if (! empty($file_list) && ! $headershown && ! $iconPDF)
{
$headershown=1;
$out.= ' '.$titletoshow.' ';
$out.= '';
}
+ else if (empty($file_list) && ! empty($iconPDF))
+ {
+ // For ajax treatment
+ $out.= ''.img_picto('', 'refresh').' '."\n";
+ }
// Loop on each file found
foreach($file_list as $file)
@@ -458,15 +463,15 @@ class FormFile
if ($modulepart == 'donation') { $relativepath = get_exdir($filename,2).$file["name"]; }
if ($modulepart == 'export') { $relativepath = $file["name"]; }
- if (!$iconPDF) $out.= "";
+ if (! $iconPDF) $out.= " ";
// Show file name with link to download
- if (!$iconPDF) $out.= '| ';
+ if (! $iconPDF) $out.= ' | ';
$out.= 'trans("File").': '.$file["name"]).' '.dol_trunc($file["name"],$maxfilenamelength);
}
@@ -474,12 +479,15 @@ class FormFile
{
$out.= img_pdf($file["name"],2);
}
- $out.= '';
- if (!$iconPDF) $out.= ' | ';
- // Affiche taille fichier
- if (!$iconPDF) $out.= ''.dol_print_size(dol_filesize($filedir."/".$file["name"])).' | ';
- // Affiche date fichier
- if (!$iconPDF) $out.= ''.dol_print_date(dol_filemtime($filedir."/".$file["name"]),'dayhour').' | ';
+ $out.= ''."\n";
+ if (! $iconPDF)
+ {
+ $out.= '';
+ // Show file size
+ $out.= ''.dol_print_size(dol_filesize($filedir."/".$file["name"])).' | ';
+ // Show file date
+ $out.= ''.dol_print_date(dol_filemtime($filedir."/".$file["name"]),'dayhour').' | ';
+ }
if ($delallowed)
{
@@ -489,7 +497,7 @@ class FormFile
$out.= '">'.img_delete().'';
}
- if (!$iconPDF) $out.= ' ';
+ if (! $iconPDF) $out.= '';
$this->numoffiles++;
}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 4463a943486..341fe8529cc 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -752,11 +752,11 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
{
if ($idprod)
{
- if ( empty($hidedesc) ) $libelleproduitservice.=$desc;
+ if ( empty($hidedesc) ) $libelleproduitservice.=dol_htmlentitiesbr($desc,1);
}
else
{
- $libelleproduitservice.=$desc;
+ $libelleproduitservice.=dol_htmlentitiesbr($desc,1);
}
}
}
diff --git a/htdocs/langs/HOWTO-Translation.txt b/htdocs/langs/HOWTO-Translation.txt
old mode 100755
new mode 100644
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5a214c0466c..f9408b2896b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -73,7 +73,7 @@ if (function_exists('get_magic_quotes_gpc')) // magic_quotes_* removed in PHP6
function test_sql_and_script_inject($val, $type)
{
$sql_inj = 0;
- // For SQL Injection (onyl GET and POST are used to be included into bad escaped SQL requests)
+ // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests)
if ($type != 2)
{
$sql_inj += preg_match('/delete[\s]+from/i', $val);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 2e00f12f5f9..f36853e6bae 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1217,17 +1217,18 @@ class Societe extends CommonObject
/**
* Add a discount for third party
- * @param remise Montant de la remise
- * @param user Utilisateur qui accorde la remise
- * @param desc Motif de l'avoir
- * @param tva_tx VAT rate
- * @return int <0 if KO, id or record if OK
+ *
+ * @param float $remise Amount of discount
+ * @param User $user User adding discount
+ * @param string $desc Reason of discount
+ * @param float $tva_tx VAT rate
+ * @return int <0 if KO, id of discount record if OK
*/
function set_remise_except($remise, $user, $desc, $tva_tx=0)
{
global $langs;
- // Nettoyage des parametres
+ // Clean parameters
$remise = price2num($remise);
$desc = trim($desc);
@@ -1269,11 +1270,12 @@ class Societe extends CommonObject
}
/**
- * \brief Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
- * \param user Filtre sur un user auteur des remises
- * \param filter Filtre autre
- * \param maxvalue Filter on max value for discount
- * \return int <0 if KO, Credit note amount otherwise
+ * Renvoie montant TTC des reductions/avoirs en cours disponibles de la societe
+ *
+ * @param User $user Filtre sur un user auteur des remises
+ * @param string $filter Filtre autre
+ * @param string $maxvalue Filter on max value for discount
+ * @return int <0 if KO, Credit note amount otherwise
*/
function getAvailableDiscounts($user='',$filter='',$maxvalue=0)
{
@@ -1294,6 +1296,7 @@ class Societe extends CommonObject
/**
* Return array of sales representatives
+ *
* @return array Array of sales representatives of third party
*/
function getSalesRepresentatives($user='')
@@ -1331,8 +1334,8 @@ class Societe extends CommonObject
/**
* Set the price level
*
- * @param $price_level
- * @param $user
+ * @param int $price_level Level of price
+ * @param User $user Use making change
*/
function set_price_level($price_level, $user)
{
|