'.$langs->trans("ToClearAllRecipientsClickHere").': '.'
';
print_barre_liste($langs->trans("MailSelectedRecipients").$cleartext,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num,$object->nbemail,'');
+ print '';
+
+ print "\n\n";
+ print '
';
+
$db->free($resql);
}
else
@@ -517,7 +530,6 @@ if ($object->fetch($id) >= 0)
dol_print_error($db);
}
- print '';
print "\n\n";
}
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 1651407d746..565e63fd749 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -125,8 +125,8 @@ class FactureRec extends Facture
$sql.= ", '".$facsrc->socid."'";
$sql.= ", ".$conf->entity;
$sql.= ", ".$this->db->idate($now);
- $sql.= ", '".$facsrc->amount."'";
- $sql.= ", '".$facsrc->remise."'";
+ $sql.= ", ".(!empty($facsrc->amount)?$facsrc->amount:'0');
+ $sql.= ", ".(!empty($facsrc->remise)?$this->remise:'0');
$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
$sql.= ", '".$user->id."'";
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 146237122ca..206856c3530 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -559,7 +559,7 @@ class ExtraFields
$this->attribute_pos[$tab->name]=$tab->pos;
}
}
-
+
return $array_name_label;
}
else
@@ -626,11 +626,11 @@ class ExtraFields
{
$tmp=explode(',',$size);
$newsize=$tmp[0];
- $out='
';
+ $out='
';
}
elseif ($type == 'varchar')
{
- $out='
';
+ $out='
';
}
elseif ($type == 'text')
{
@@ -646,27 +646,27 @@ class ExtraFields
} else {
$checked=' value="1" ';
}
- $out='
';
+ $out='
';
}
elseif ($type == 'mail')
{
- $out='
';
+ $out='
';
}
elseif ($type == 'phone')
{
- $out='
';
+ $out='
';
}
elseif ($type == 'price')
{
- $out='
'.$langs->getCurrencySymbol($conf->currency);
+ $out='
'.$langs->getCurrencySymbol($conf->currency);
}
elseif ($type == 'double')
{
- $out='
';
+ $out='
';
}
elseif ($type == 'select')
{
- $out='