This commit is contained in:
Laurent Destailleur 2023-02-20 13:59:46 +01:00
parent cdf221bfb1
commit 9322cb28ed
6 changed files with 8 additions and 8 deletions

View File

@ -434,7 +434,7 @@ if ($result) {
$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id; $tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
// This part of code is no more required. it is here to solve case where a link were missing (ith v14.0.0) and keep writing in accountancy complete. // This part of code is no more required. it is here to solve case where a link were missing (ith v14.0.0) and keep writing in accountancy complete.
// Note: A better way to fix this is to delete payement of salary and recreate it, or to fix the bookkeeping table manually after. // Note: A better way to fix this is to delete payment of salary and recreate it, or to fix the bookkeeping table manually after.
if (!empty($conf->global->ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USEr_ON_SALARY_BANK_PAYMENT)) { if (!empty($conf->global->ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USEr_ON_SALARY_BANK_PAYMENT)) {
$tmpsalary = new Salary($db); $tmpsalary = new Salary($db);
$tmpsalary->fetch($paymentsalstatic->id); $tmpsalary->fetch($paymentsalstatic->id);

View File

@ -242,7 +242,7 @@ $thirdpartystatic = new Societe($db);
$result = $object->fetch($id, $ref); $result = $object->fetch($id, $ref);
if ($result <= 0) { if ($result <= 0) {
dol_print_error($db, 'Payement '.$id.' not found in database'); dol_print_error($db, 'Payment '.$id.' not found in database');
exit; exit;
} }

View File

@ -868,7 +868,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && isModEnabled("ba
//} //}
/* /*
* Payement Loan * Payment Loan
*/ */
if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && isModEnabled('loan') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) { if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && isModEnabled('loan') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {

View File

@ -1646,7 +1646,7 @@ class FormMail extends Form
$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine'; $tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
} }
//Online payement link //Online payment link
if (isModEnabled('adherent')) { if (isModEnabled('adherent')) {
$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember'; $tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
} }

View File

@ -211,7 +211,7 @@ class pdf_paiement
if (!empty($socid)) { if (!empty($socid)) {
$sql .= " AND s.rowid = ".((int) $socid); $sql .= " AND s.rowid = ".((int) $socid);
} }
// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code // If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payment are ordered by paiement_code
if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) { if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) {
$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiement ASC"; $sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiement ASC";
} else { } else {
@ -249,7 +249,7 @@ class pdf_paiement
if (!empty($socid)) { if (!empty($socid)) {
$sql .= " AND s.rowid = ".((int) $socid); $sql .= " AND s.rowid = ".((int) $socid);
} }
// If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code // If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payment fourn are ordered by paiement_code
if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD)) { if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD)) {
$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC"; $sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC";
} else { } else {

View File

@ -457,7 +457,7 @@ class Loan extends CommonObject
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Tag loan as payement as unpaid * Tag loan as payment as unpaid
* @deprecated * @deprecated
* @see setUnpaid() * @see setUnpaid()
* @param User $user Object user making change * @param User $user Object user making change
@ -471,7 +471,7 @@ class Loan extends CommonObject
} }
/** /**
* Tag loan as payement as unpaid * Tag loan as payment as unpaid
* *
* @param User $user Object user making change * @param User $user Object user making change
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK