@@ -215,7 +215,9 @@
Le bénéficiaire certifie sur l’honneur que les dons et versements qu’il reçoit ouvrent droit à la réduction d'impôt prévue à l’article (3) :
';
}
+ */
// Define contents
$donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html";
@@ -186,7 +188,7 @@ class html_cerfafr extends ModeleDon
$form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form);
$form = str_replace('__DonationDatePayment__',$outputlangs->trans("DonationDatePayment"),$form);
$form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form);
- $form = str_replace('__CodeDon__',$CodeDon,$form);
+ // $form = str_replace('__CodeDon__',$CodeDon,$form);
$form = str_replace('__Name__',$outputlangs->trans("Name"),$form);
$form = str_replace('__Address__',$outputlangs->trans("Address"),$form);
$form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form);
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index bd9fd680087..0b3bcf469d5 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -618,7 +618,7 @@ if ($action == 'confirm_cancel' && GETPOST('confirm') == 'yes')
// From
$expediteur = new User($db);
- $expediteur->fetch($cp->fk_validator);
+ $expediteur->fetch($cp->fk_user_cancel);
$emailFrom = $expediteur->email;
// Subject
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index eb558e1c37f..1d1c624aa4c 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -817,18 +817,17 @@ class Holiday extends CommonObject
}
/**
- * Retourne la valeur d'un paramètre de configuration
+ * Return value of a conf parameterfor leave module
+ * TODO Move this into llx_const table
*
- * @param string $name name du paramètre de configuration
- * @param int $fk_type Filter on type
- * @return string retourne la valeur du paramètre
+ * @param string $name name of parameter
+ * @return string value of parameter
*/
- function getConfCP($name, $fk_type=0)
+ function getConfCP($name)
{
$sql = "SELECT value";
$sql.= " FROM ".MAIN_DB_PREFIX."holiday_config";
$sql.= " WHERE name = '".$name."'";
- if ($fk_type > 0) $sql.=" AND fk_type = ".$fk_type;
dol_syslog(get_class($this).'::getConfCP name='.$name.'', LOG_DEBUG);
$result = $this->db->query($sql);
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index eb7fea3598c..71d286348e8 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -159,7 +159,7 @@ llxHeader(array(),$langs->trans('CPTitreMenu'));
print load_fiche_titre($langs->trans('MenuConfCP'), '', 'title_hrm.png');
print '
'.$langs->trans('LastUpdateCP').': '."\n";
-$lastUpdate = $holiday->getConfCP('lastUpdate', 0);
+$lastUpdate = $holiday->getConfCP('lastUpdate');
if ($lastUpdate)
{
$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index d12d7595f94..f78ac37601c 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -25,6 +25,7 @@ LastModifiedProposals=Last %s modified proposals
AllPropals=All proposals
LastProposals=Last proposals
SearchAProposal=Search a proposal
+NoProposal=No proposal
ProposalsStatistics=Commercial proposal's statistics
NumberOfProposalsByMonth=Number by month
AmountOfProposalsByMonthHT=Amount by month (net of tax)
diff --git a/htdocs/user/class/userbankaccount.class.php b/htdocs/user/class/userbankaccount.class.php
index c89d7162c2a..30c795bbd72 100644
--- a/htdocs/user/class/userbankaccount.class.php
+++ b/htdocs/user/class/userbankaccount.class.php
@@ -133,15 +133,14 @@ class UserBankAccount extends Account
* Load record from database
*
* @param int $id Id of record
- * @param int $socid Id of company. If this is filled, function will return the default RIB of company
* @return int <0 if KO, >0 if OK
*/
- function fetch($id, $socid=0)
+ function fetch($id)
{
- if (empty($id) && empty($socid)) return -1;
+ if (empty($id)) return -1;
$sql = "SELECT rowid, fk_user, entity, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
- $sql.= " owner_address, default_rib, label, datec, tms as datem";
+ $sql.= " owner_address, label, datec, tms as datem";
$sql.= " FROM ".MAIN_DB_PREFIX."user_rib";
if ($id) $sql.= " WHERE rowid = ".$id;
if ($socid) $sql.= " WHERE fk_user = ".$userid;